IndexedDB: layout test style update
authordgrogan@chromium.org <dgrogan@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 12 Mar 2012 20:26:20 +0000 (20:26 +0000)
committerdgrogan@chromium.org <dgrogan@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 12 Mar 2012 20:26:20 +0000 (20:26 +0000)
https://bugs.webkit.org/show_bug.cgi?id=80555

Change layoutTestController.waitUntilDone to var jsTestIsAsync = true
and idb-specific done() to finishJSTest();

Following the uniform style results in less overall code and makes
them easier to convert to worker layout tests.

Reviewed by Tony Chang.

* storage/indexeddb/constants.html:
* storage/indexeddb/create-and-remove-object-store.html:
* storage/indexeddb/create-object-store-options.html:
* storage/indexeddb/createObjectStore-name-argument-required.html:
* storage/indexeddb/createObjectStore-null-name.html:
* storage/indexeddb/cursor-continue.html:
* storage/indexeddb/cursor-delete.html:
* storage/indexeddb/cursor-inconsistency.html:
* storage/indexeddb/cursor-index-delete.html:
* storage/indexeddb/cursor-key-order.html:
* storage/indexeddb/cursor-primary-key-order.html:
* storage/indexeddb/cursor-reverse-bug.html:
* storage/indexeddb/cursor-skip-deleted.html:
* storage/indexeddb/cursor-update-value-argument-required.html:
* storage/indexeddb/cursor-update.html:
* storage/indexeddb/data-corruption.html:
* storage/indexeddb/database-basics.html:
* storage/indexeddb/database-name-undefined.html:
* storage/indexeddb/database-odd-names.html:
* storage/indexeddb/database-quota.html:
* storage/indexeddb/delete-closed-database-object.html:
* storage/indexeddb/delete-range.html:
* storage/indexeddb/deleteIndex.html:
* storage/indexeddb/deleteObjectStore-name-argument-required.html:
* storage/indexeddb/deleteObjectStore-null-name.html:
* storage/indexeddb/duplicates.html:
* storage/indexeddb/error-causes-abort-by-default.html:
* storage/indexeddb/exception-in-event-aborts-expected.txt:
* storage/indexeddb/exception-in-event-aborts.html:
* storage/indexeddb/factory-basics.html:
* storage/indexeddb/factory-cmp.html:
* storage/indexeddb/factory-deletedatabase-interactions.html:
* storage/indexeddb/factory-deletedatabase.html:
* storage/indexeddb/index-count.html:
* storage/indexeddb/index-cursor.html:
* storage/indexeddb/index-get-key-argument-required.html:
* storage/indexeddb/index-multientry.html:
* storage/indexeddb/index-unique.html:
* storage/indexeddb/invalid-keys.html:
* storage/indexeddb/key-generator.html:
* storage/indexeddb/key-sort-order-across-types.html:
* storage/indexeddb/key-sort-order-date.html:
* storage/indexeddb/key-type-array.html:
* storage/indexeddb/key-type-infinity.html:
* storage/indexeddb/keypath-basics.html:
* storage/indexeddb/keypath-edges.html:
* storage/indexeddb/keypath-fetch-key.html:
* storage/indexeddb/keyrange-required-arguments.html:
* storage/indexeddb/keyrange.html:
* storage/indexeddb/list-ordering.html:
* storage/indexeddb/mozilla/add-twice-failure.html:
* storage/indexeddb/mozilla/autoincrement-indexes.html:
* storage/indexeddb/mozilla/bad-keypath.html:
* storage/indexeddb/mozilla/clear.html:
* storage/indexeddb/mozilla/create-index-unique.html:
* storage/indexeddb/mozilla/create-index-with-integer-keys.html:
* storage/indexeddb/mozilla/create-objectstore-basics.html:
* storage/indexeddb/mozilla/create-objectstore-null-name.html:
* storage/indexeddb/mozilla/cursor-mutation-objectstore-only.html:
* storage/indexeddb/mozilla/cursor-mutation.html:
* storage/indexeddb/mozilla/cursor-update-updates-indexes.html:
* storage/indexeddb/mozilla/cursors.html:
* storage/indexeddb/mozilla/delete-result.html:
* storage/indexeddb/mozilla/event-source.html:
* storage/indexeddb/mozilla/global-data.html:
* storage/indexeddb/mozilla/indexes.html:
* storage/indexeddb/mozilla/key-requirements-delete-null-key.html:
* storage/indexeddb/mozilla/key-requirements-inline-and-passed.html:
* storage/indexeddb/mozilla/key-requirements-put-no-key.html:
* storage/indexeddb/mozilla/key-requirements-put-null-key.html:
* storage/indexeddb/mozilla/key-requirements.html:
* storage/indexeddb/mozilla/object-cursors.html:
* storage/indexeddb/mozilla/object-identity.html:
* storage/indexeddb/mozilla/object-store-inline-autoincrement-key-added-on-put.html:
* storage/indexeddb/mozilla/object-store-remove-values.html:
* storage/indexeddb/mozilla/objectstorenames.html:
* storage/indexeddb/mozilla/odd-result-order.html:
* storage/indexeddb/mozilla/open-database-null-name.html:
* storage/indexeddb/mozilla/put-get-values.html:
* storage/indexeddb/mozilla/readonly-transactions.html:
* storage/indexeddb/mozilla/readwrite-transactions.html:
* storage/indexeddb/mozilla/readyState.html:
* storage/indexeddb/mozilla/remove-index.html:
* storage/indexeddb/mozilla/remove-objectstore.html:
* storage/indexeddb/mozilla/versionchange-abort.html:
* storage/indexeddb/mozilla/versionchange.html:
* storage/indexeddb/mutating-cursor.html:
* storage/indexeddb/objectStore-required-arguments.html:
* storage/indexeddb/objectstore-autoincrement.html:
* storage/indexeddb/objectstore-clear.html:
* storage/indexeddb/objectstore-count.html:
* storage/indexeddb/objectstore-cursor.html:
* storage/indexeddb/objectstore-removeobjectstore.html:
* storage/indexeddb/odd-strings.html:
* storage/indexeddb/open-close-version.html:
* storage/indexeddb/open-cursor.html:
* storage/indexeddb/open-during-transaction.html:
* storage/indexeddb/queued-commands.html:
* storage/indexeddb/readonly-properties.html:
* storage/indexeddb/readonly.html:
* storage/indexeddb/request-event-propagation.html:
* storage/indexeddb/resources/shared.js:
(unexpectedSuccessCallback):
(unexpectedErrorCallback):
(unexpectedAbortCallback):
(unexpectedCompleteCallback):
(unexpectedBlockedCallback):
* storage/indexeddb/setVersion-null.html:
* storage/indexeddb/setVersion-undefined.html:
* storage/indexeddb/set_version_blocked.html:
* storage/indexeddb/set_version_queue.html:
* storage/indexeddb/structured-clone.html:
* storage/indexeddb/transaction-abort-with-js-recursion-cross-frame.html:
* storage/indexeddb/transaction-abort-with-js-recursion.html:
* storage/indexeddb/transaction-abort.html:
* storage/indexeddb/transaction-after-close.html:
* storage/indexeddb/transaction-and-objectstore-calls.html:
* storage/indexeddb/transaction-crash-on-abort.html:
* storage/indexeddb/transaction-event-propagation.html:
* storage/indexeddb/transaction-read-only.html:
* storage/indexeddb/transaction-rollback.html:
* storage/indexeddb/transaction-storeNames-required.html:
* storage/indexeddb/two-version-changes.html:
* storage/indexeddb/value-undefined.html:
* storage/indexeddb/values-odd-types.html:
* storage/indexeddb/version-change-abort-expected.txt:
* storage/indexeddb/version-change-abort.html:
* storage/indexeddb/version-change-exclusive.html:
* storage/indexeddb/versionchangerequest-activedomobject.html:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@110468 268f45cc-cd09-0410-ab3c-d52691b4dbfc

125 files changed:
LayoutTests/ChangeLog
LayoutTests/storage/indexeddb/constants.html
LayoutTests/storage/indexeddb/create-and-remove-object-store.html
LayoutTests/storage/indexeddb/create-object-store-options.html
LayoutTests/storage/indexeddb/createObjectStore-name-argument-required.html
LayoutTests/storage/indexeddb/createObjectStore-null-name.html
LayoutTests/storage/indexeddb/cursor-continue.html
LayoutTests/storage/indexeddb/cursor-delete.html
LayoutTests/storage/indexeddb/cursor-inconsistency.html
LayoutTests/storage/indexeddb/cursor-index-delete.html
LayoutTests/storage/indexeddb/cursor-key-order.html
LayoutTests/storage/indexeddb/cursor-primary-key-order.html
LayoutTests/storage/indexeddb/cursor-reverse-bug.html
LayoutTests/storage/indexeddb/cursor-skip-deleted.html
LayoutTests/storage/indexeddb/cursor-update-value-argument-required.html
LayoutTests/storage/indexeddb/cursor-update.html
LayoutTests/storage/indexeddb/data-corruption.html
LayoutTests/storage/indexeddb/database-basics.html
LayoutTests/storage/indexeddb/database-name-undefined.html
LayoutTests/storage/indexeddb/database-odd-names.html
LayoutTests/storage/indexeddb/database-quota.html
LayoutTests/storage/indexeddb/delete-closed-database-object.html
LayoutTests/storage/indexeddb/delete-range.html
LayoutTests/storage/indexeddb/deleteIndex.html
LayoutTests/storage/indexeddb/deleteObjectStore-name-argument-required.html
LayoutTests/storage/indexeddb/deleteObjectStore-null-name.html
LayoutTests/storage/indexeddb/duplicates.html
LayoutTests/storage/indexeddb/error-causes-abort-by-default.html
LayoutTests/storage/indexeddb/exception-in-event-aborts-expected.txt
LayoutTests/storage/indexeddb/exception-in-event-aborts.html
LayoutTests/storage/indexeddb/factory-basics.html
LayoutTests/storage/indexeddb/factory-cmp.html
LayoutTests/storage/indexeddb/factory-deletedatabase-interactions.html
LayoutTests/storage/indexeddb/factory-deletedatabase.html
LayoutTests/storage/indexeddb/index-count.html
LayoutTests/storage/indexeddb/index-cursor.html
LayoutTests/storage/indexeddb/index-get-key-argument-required.html
LayoutTests/storage/indexeddb/index-multientry.html
LayoutTests/storage/indexeddb/index-unique.html
LayoutTests/storage/indexeddb/invalid-keys.html
LayoutTests/storage/indexeddb/key-generator.html
LayoutTests/storage/indexeddb/key-sort-order-across-types.html
LayoutTests/storage/indexeddb/key-sort-order-date.html
LayoutTests/storage/indexeddb/key-type-array.html
LayoutTests/storage/indexeddb/key-type-infinity.html
LayoutTests/storage/indexeddb/keypath-basics.html
LayoutTests/storage/indexeddb/keypath-edges.html
LayoutTests/storage/indexeddb/keypath-fetch-key.html
LayoutTests/storage/indexeddb/keyrange-required-arguments.html
LayoutTests/storage/indexeddb/keyrange.html
LayoutTests/storage/indexeddb/list-ordering.html
LayoutTests/storage/indexeddb/mozilla/add-twice-failure.html
LayoutTests/storage/indexeddb/mozilla/autoincrement-indexes.html
LayoutTests/storage/indexeddb/mozilla/bad-keypath.html
LayoutTests/storage/indexeddb/mozilla/clear.html
LayoutTests/storage/indexeddb/mozilla/create-index-unique.html
LayoutTests/storage/indexeddb/mozilla/create-index-with-integer-keys.html
LayoutTests/storage/indexeddb/mozilla/create-objectstore-basics.html
LayoutTests/storage/indexeddb/mozilla/create-objectstore-null-name.html
LayoutTests/storage/indexeddb/mozilla/cursor-mutation-objectstore-only.html
LayoutTests/storage/indexeddb/mozilla/cursor-mutation.html
LayoutTests/storage/indexeddb/mozilla/cursor-update-updates-indexes.html
LayoutTests/storage/indexeddb/mozilla/cursors.html
LayoutTests/storage/indexeddb/mozilla/delete-result.html
LayoutTests/storage/indexeddb/mozilla/event-source.html
LayoutTests/storage/indexeddb/mozilla/global-data.html
LayoutTests/storage/indexeddb/mozilla/indexes.html
LayoutTests/storage/indexeddb/mozilla/key-requirements-delete-null-key.html
LayoutTests/storage/indexeddb/mozilla/key-requirements-inline-and-passed.html
LayoutTests/storage/indexeddb/mozilla/key-requirements-put-no-key.html
LayoutTests/storage/indexeddb/mozilla/key-requirements-put-null-key.html
LayoutTests/storage/indexeddb/mozilla/key-requirements.html
LayoutTests/storage/indexeddb/mozilla/object-cursors.html
LayoutTests/storage/indexeddb/mozilla/object-identity.html
LayoutTests/storage/indexeddb/mozilla/object-store-inline-autoincrement-key-added-on-put.html
LayoutTests/storage/indexeddb/mozilla/object-store-remove-values.html
LayoutTests/storage/indexeddb/mozilla/objectstorenames.html
LayoutTests/storage/indexeddb/mozilla/odd-result-order.html
LayoutTests/storage/indexeddb/mozilla/open-database-null-name.html
LayoutTests/storage/indexeddb/mozilla/put-get-values.html
LayoutTests/storage/indexeddb/mozilla/readonly-transactions.html
LayoutTests/storage/indexeddb/mozilla/readwrite-transactions.html
LayoutTests/storage/indexeddb/mozilla/readyState.html
LayoutTests/storage/indexeddb/mozilla/remove-index.html
LayoutTests/storage/indexeddb/mozilla/remove-objectstore.html
LayoutTests/storage/indexeddb/mozilla/versionchange-abort.html
LayoutTests/storage/indexeddb/mozilla/versionchange.html
LayoutTests/storage/indexeddb/mutating-cursor.html
LayoutTests/storage/indexeddb/objectStore-required-arguments.html
LayoutTests/storage/indexeddb/objectstore-autoincrement.html
LayoutTests/storage/indexeddb/objectstore-clear.html
LayoutTests/storage/indexeddb/objectstore-count.html
LayoutTests/storage/indexeddb/objectstore-cursor.html
LayoutTests/storage/indexeddb/objectstore-removeobjectstore.html
LayoutTests/storage/indexeddb/odd-strings.html
LayoutTests/storage/indexeddb/open-close-version.html
LayoutTests/storage/indexeddb/open-cursor.html
LayoutTests/storage/indexeddb/open-during-transaction.html
LayoutTests/storage/indexeddb/queued-commands.html
LayoutTests/storage/indexeddb/readonly-properties.html
LayoutTests/storage/indexeddb/readonly.html
LayoutTests/storage/indexeddb/request-event-propagation.html
LayoutTests/storage/indexeddb/resources/shared.js
LayoutTests/storage/indexeddb/setVersion-null.html
LayoutTests/storage/indexeddb/setVersion-undefined.html
LayoutTests/storage/indexeddb/set_version_blocked.html
LayoutTests/storage/indexeddb/set_version_queue.html
LayoutTests/storage/indexeddb/structured-clone.html
LayoutTests/storage/indexeddb/transaction-abort-with-js-recursion-cross-frame.html
LayoutTests/storage/indexeddb/transaction-abort-with-js-recursion.html
LayoutTests/storage/indexeddb/transaction-abort.html
LayoutTests/storage/indexeddb/transaction-after-close.html
LayoutTests/storage/indexeddb/transaction-and-objectstore-calls.html
LayoutTests/storage/indexeddb/transaction-crash-on-abort.html
LayoutTests/storage/indexeddb/transaction-event-propagation.html
LayoutTests/storage/indexeddb/transaction-read-only.html
LayoutTests/storage/indexeddb/transaction-rollback.html
LayoutTests/storage/indexeddb/transaction-storeNames-required.html
LayoutTests/storage/indexeddb/two-version-changes.html
LayoutTests/storage/indexeddb/value-undefined.html
LayoutTests/storage/indexeddb/values-odd-types.html
LayoutTests/storage/indexeddb/version-change-abort-expected.txt
LayoutTests/storage/indexeddb/version-change-abort.html
LayoutTests/storage/indexeddb/version-change-exclusive.html
LayoutTests/storage/indexeddb/versionchangerequest-activedomobject.html

index d6775ba..b5aff3c 100644 (file)
@@ -1,3 +1,146 @@
+2012-03-12  David Grogan  <dgrogan@chromium.org>
+
+        IndexedDB: layout test style update
+        https://bugs.webkit.org/show_bug.cgi?id=80555
+
+        Change layoutTestController.waitUntilDone to var jsTestIsAsync = true
+        and idb-specific done() to finishJSTest();
+
+        Following the uniform style results in less overall code and makes
+        them easier to convert to worker layout tests.
+
+        Reviewed by Tony Chang.
+
+        * storage/indexeddb/constants.html:
+        * storage/indexeddb/create-and-remove-object-store.html:
+        * storage/indexeddb/create-object-store-options.html:
+        * storage/indexeddb/createObjectStore-name-argument-required.html:
+        * storage/indexeddb/createObjectStore-null-name.html:
+        * storage/indexeddb/cursor-continue.html:
+        * storage/indexeddb/cursor-delete.html:
+        * storage/indexeddb/cursor-inconsistency.html:
+        * storage/indexeddb/cursor-index-delete.html:
+        * storage/indexeddb/cursor-key-order.html:
+        * storage/indexeddb/cursor-primary-key-order.html:
+        * storage/indexeddb/cursor-reverse-bug.html:
+        * storage/indexeddb/cursor-skip-deleted.html:
+        * storage/indexeddb/cursor-update-value-argument-required.html:
+        * storage/indexeddb/cursor-update.html:
+        * storage/indexeddb/data-corruption.html:
+        * storage/indexeddb/database-basics.html:
+        * storage/indexeddb/database-name-undefined.html:
+        * storage/indexeddb/database-odd-names.html:
+        * storage/indexeddb/database-quota.html:
+        * storage/indexeddb/delete-closed-database-object.html:
+        * storage/indexeddb/delete-range.html:
+        * storage/indexeddb/deleteIndex.html:
+        * storage/indexeddb/deleteObjectStore-name-argument-required.html:
+        * storage/indexeddb/deleteObjectStore-null-name.html:
+        * storage/indexeddb/duplicates.html:
+        * storage/indexeddb/error-causes-abort-by-default.html:
+        * storage/indexeddb/exception-in-event-aborts-expected.txt:
+        * storage/indexeddb/exception-in-event-aborts.html:
+        * storage/indexeddb/factory-basics.html:
+        * storage/indexeddb/factory-cmp.html:
+        * storage/indexeddb/factory-deletedatabase-interactions.html:
+        * storage/indexeddb/factory-deletedatabase.html:
+        * storage/indexeddb/index-count.html:
+        * storage/indexeddb/index-cursor.html:
+        * storage/indexeddb/index-get-key-argument-required.html:
+        * storage/indexeddb/index-multientry.html:
+        * storage/indexeddb/index-unique.html:
+        * storage/indexeddb/invalid-keys.html:
+        * storage/indexeddb/key-generator.html:
+        * storage/indexeddb/key-sort-order-across-types.html:
+        * storage/indexeddb/key-sort-order-date.html:
+        * storage/indexeddb/key-type-array.html:
+        * storage/indexeddb/key-type-infinity.html:
+        * storage/indexeddb/keypath-basics.html:
+        * storage/indexeddb/keypath-edges.html:
+        * storage/indexeddb/keypath-fetch-key.html:
+        * storage/indexeddb/keyrange-required-arguments.html:
+        * storage/indexeddb/keyrange.html:
+        * storage/indexeddb/list-ordering.html:
+        * storage/indexeddb/mozilla/add-twice-failure.html:
+        * storage/indexeddb/mozilla/autoincrement-indexes.html:
+        * storage/indexeddb/mozilla/bad-keypath.html:
+        * storage/indexeddb/mozilla/clear.html:
+        * storage/indexeddb/mozilla/create-index-unique.html:
+        * storage/indexeddb/mozilla/create-index-with-integer-keys.html:
+        * storage/indexeddb/mozilla/create-objectstore-basics.html:
+        * storage/indexeddb/mozilla/create-objectstore-null-name.html:
+        * storage/indexeddb/mozilla/cursor-mutation-objectstore-only.html:
+        * storage/indexeddb/mozilla/cursor-mutation.html:
+        * storage/indexeddb/mozilla/cursor-update-updates-indexes.html:
+        * storage/indexeddb/mozilla/cursors.html:
+        * storage/indexeddb/mozilla/delete-result.html:
+        * storage/indexeddb/mozilla/event-source.html:
+        * storage/indexeddb/mozilla/global-data.html:
+        * storage/indexeddb/mozilla/indexes.html:
+        * storage/indexeddb/mozilla/key-requirements-delete-null-key.html:
+        * storage/indexeddb/mozilla/key-requirements-inline-and-passed.html:
+        * storage/indexeddb/mozilla/key-requirements-put-no-key.html:
+        * storage/indexeddb/mozilla/key-requirements-put-null-key.html:
+        * storage/indexeddb/mozilla/key-requirements.html:
+        * storage/indexeddb/mozilla/object-cursors.html:
+        * storage/indexeddb/mozilla/object-identity.html:
+        * storage/indexeddb/mozilla/object-store-inline-autoincrement-key-added-on-put.html:
+        * storage/indexeddb/mozilla/object-store-remove-values.html:
+        * storage/indexeddb/mozilla/objectstorenames.html:
+        * storage/indexeddb/mozilla/odd-result-order.html:
+        * storage/indexeddb/mozilla/open-database-null-name.html:
+        * storage/indexeddb/mozilla/put-get-values.html:
+        * storage/indexeddb/mozilla/readonly-transactions.html:
+        * storage/indexeddb/mozilla/readwrite-transactions.html:
+        * storage/indexeddb/mozilla/readyState.html:
+        * storage/indexeddb/mozilla/remove-index.html:
+        * storage/indexeddb/mozilla/remove-objectstore.html:
+        * storage/indexeddb/mozilla/versionchange-abort.html:
+        * storage/indexeddb/mozilla/versionchange.html:
+        * storage/indexeddb/mutating-cursor.html:
+        * storage/indexeddb/objectStore-required-arguments.html:
+        * storage/indexeddb/objectstore-autoincrement.html:
+        * storage/indexeddb/objectstore-clear.html:
+        * storage/indexeddb/objectstore-count.html:
+        * storage/indexeddb/objectstore-cursor.html:
+        * storage/indexeddb/objectstore-removeobjectstore.html:
+        * storage/indexeddb/odd-strings.html:
+        * storage/indexeddb/open-close-version.html:
+        * storage/indexeddb/open-cursor.html:
+        * storage/indexeddb/open-during-transaction.html:
+        * storage/indexeddb/queued-commands.html:
+        * storage/indexeddb/readonly-properties.html:
+        * storage/indexeddb/readonly.html:
+        * storage/indexeddb/request-event-propagation.html:
+        * storage/indexeddb/resources/shared.js:
+        (unexpectedSuccessCallback):
+        (unexpectedErrorCallback):
+        (unexpectedAbortCallback):
+        (unexpectedCompleteCallback):
+        (unexpectedBlockedCallback):
+        * storage/indexeddb/setVersion-null.html:
+        * storage/indexeddb/setVersion-undefined.html:
+        * storage/indexeddb/set_version_blocked.html:
+        * storage/indexeddb/set_version_queue.html:
+        * storage/indexeddb/structured-clone.html:
+        * storage/indexeddb/transaction-abort-with-js-recursion-cross-frame.html:
+        * storage/indexeddb/transaction-abort-with-js-recursion.html:
+        * storage/indexeddb/transaction-abort.html:
+        * storage/indexeddb/transaction-after-close.html:
+        * storage/indexeddb/transaction-and-objectstore-calls.html:
+        * storage/indexeddb/transaction-crash-on-abort.html:
+        * storage/indexeddb/transaction-event-propagation.html:
+        * storage/indexeddb/transaction-read-only.html:
+        * storage/indexeddb/transaction-rollback.html:
+        * storage/indexeddb/transaction-storeNames-required.html:
+        * storage/indexeddb/two-version-changes.html:
+        * storage/indexeddb/value-undefined.html:
+        * storage/indexeddb/values-odd-types.html:
+        * storage/indexeddb/version-change-abort-expected.txt:
+        * storage/indexeddb/version-change-abort.html:
+        * storage/indexeddb/version-change-exclusive.html:
+        * storage/indexeddb/versionchangerequest-activedomobject.html:
+
 2012-03-12  Ryosuke Niwa  <rniwa@webkit.org>
 
         Mac rebaseline.
index a161e9e..3816134 100644 (file)
@@ -9,8 +9,6 @@
 <script>
 
 description("Test IndexedDB's constants.");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -42,8 +40,9 @@ function test()
 
 test();
 
-done();
+finishJSTest();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 32bae1d..1453754 100644 (file)
@@ -9,8 +9,6 @@
 <script>
 
 description("Test IndexedDB's create and removeObjectStore");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -62,12 +60,13 @@ function tryOnceMore()
     debug("Trying remove with store that already exists");
     evalAndExpectException("db.deleteObjectStore('tmp')", "webkitIDBDatabaseException.NOT_ALLOWED_ERR");
 
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 7a8aff4..078e508 100644 (file)
@@ -9,8 +9,6 @@
 <script>
 
 description("Test IndexedDB's createObjectStore's various options");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -79,12 +77,13 @@ function checkB()
 {
     shouldBe("event.target.result.a", "{a: 0}");
 
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 60e99e8..b63f398 100644 (file)
@@ -10,8 +10,6 @@
 <script>
 
 description("Test IndexedDB createObjectStore name argument is required");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -45,12 +43,13 @@ function createAndPopulateObjectStore()
     deleteAllObjectStores(db);
 
     shouldThrow("db.createObjectStore();");
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index d7df870..76e9fb1 100644 (file)
@@ -10,8 +10,6 @@
 <script>
 
 description("Test IndexedDB createObjectStore null handling");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -46,12 +44,13 @@ function createAndPopulateObjectStore()
 
     objectStore = evalAndLog("db.createObjectStore(null);");
     shouldBe("objectStore.name", "'null'");
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 498cf89..64fb0bb 100644 (file)
@@ -9,8 +9,6 @@
 <script> 
 
 description("Test IndexedDB's IDBCursor.continue() with a key parameter.");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 var date = new Date();
 
@@ -276,11 +274,12 @@ function descendingErrorTestEqual()
 function onTransactionComplete()
 {
     evalAndExpectException("cursor.continue()", "IDBDatabaseException.TRANSACTION_INACTIVE_ERR");
-    done();
+    finishJSTest();
 }
 
 test();
  
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index a5c45e6..9fe8ede 100644 (file)
@@ -9,8 +9,6 @@
 <script>
 
 description("Test IndexedDB's openCursor.");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 test();
 
@@ -107,10 +105,11 @@ function deleteObject()
 function verifyObjectDeleted()
 {
     shouldBe("event.target.result", "undefined");
-    done();
+    finishJSTest();
 }
 
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index de7d92e..194c2c6 100644 (file)
@@ -9,8 +9,6 @@
 <script>
 
 description("Test consistency of IndexedDB's cursor objects.");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 test();
 
@@ -87,10 +85,11 @@ function checkCursor()
 function transactionComplete()
 {
     debug("transactionComplete()");
-    done();
+    finishJSTest();
 }
 
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 613a343..e1a4b7b 100644 (file)
@@ -9,8 +9,6 @@
 <script>
 
 description("Test IndexedDB's openCursor.");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 test();
 
@@ -111,10 +109,11 @@ function deleteObject()
 function verifyObjectDeleted()
 {
     shouldBe("event.target.result", "undefined");
-    done();
+    finishJSTest();
 }
 
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 681caf9..5a34cde 100644 (file)
@@ -9,8 +9,6 @@
 <script>
 
 description("Test IndexedDB keys ordering and readback from cursors.");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -188,7 +186,7 @@ function checkStore()
 function finishUp()
 {
     testKeyCompare();
-    done();
+    finishJSTest();
 }
 
 function testKeyCompare()
@@ -237,5 +235,6 @@ function testKeyCompare()
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index fcc7d79..84a117c 100644 (file)
@@ -10,8 +10,6 @@
 <script>
 
 description("Test IndexedDB primary key ordering and readback from cursors.");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -104,7 +102,7 @@ function checkStore()
             cursor.continue();
         } else {
             shouldBeTrue("count === keys.length");
-            done();
+            finishJSTest();
         }
     };
 }
@@ -112,5 +110,6 @@ function checkStore()
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 0549939..b5594df 100644 (file)
@@ -9,8 +9,6 @@
 <script>
 
 description("Test IndexedDB keys ordering and readback from cursors.");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -72,7 +70,7 @@ function testCursor()
 
     if (tests.length === 0) {
         debug("No more tests.");
-        done();
+        finishJSTest();
         return;
     }
 
@@ -115,6 +113,7 @@ function testCursor()
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
 
index cfe7208..c26eaf4 100644 (file)
@@ -9,8 +9,6 @@
 <script>
 
 description("Test IndexedDB's cursor skips deleted entries.");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 var names = ['Alpha', 'Bravo', 'Charlie', 'Delta', 'Echo', 'Foxtrot', 'Golf',
              'Hotel', 'India', 'Juliet', 'Kilo', 'Lima', 'Mike', 'November',
@@ -196,10 +194,11 @@ function indexCursorTest()
 function transactionComplete()
 {
     debug("transactionComplete():");
-    done();
+    finishJSTest();
 }
 
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index bcfd10b..d846f04 100644 (file)
@@ -10,8 +10,6 @@
 <script>
 
 description("Test IndexedDB cursor.update required arguments");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -81,7 +79,7 @@ function testGroup3()
         } else {
             testFailed("cursor was null");
         }
-        done();
+        finishJSTest();
     }
 }
 
@@ -89,6 +87,7 @@ function testGroup3()
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
 
index 948f225..ae19c97 100644 (file)
@@ -9,8 +9,6 @@
 <script>
 
 description("Test IndexedDB's cursor update.");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 test();
 
@@ -218,10 +216,11 @@ function keyCursor()
 function transactionComplete()
 {
     debug("transactionComplete()");
-    done();
+    finishJSTest();
 }
 
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 00e4c31..0bfb157 100644 (file)
@@ -9,8 +9,6 @@
 <script>
 
 description("Test that data inserted into IndexedDB does not get corrupted on disk.");
-if (window.layoutTestController) 
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -65,12 +63,13 @@ function getData()
 function doCheck()
 {
     shouldBeTrue("event.target.result.x.toString() == testDate.toString()");
-    done();
+    finishJSTest();
 }
 
 test();
 
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 47683e8..8afc1ba 100644 (file)
@@ -9,8 +9,6 @@
 <script>
 
 description("Test the basics of IndexedDB's IDBDatabase.");
-if (window.layoutTestController) 
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -119,12 +117,13 @@ function testClose()
     evalAndExpectException("db.transaction('test123')", "IDBDatabaseException.NOT_ALLOWED_ERR");
     debug("Call twice, make sure it's harmless");
     evalAndLog("db.close()");
-    done();
+    finishJSTest();
 }
 
 test();
 
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 66a7e87..d6fc954 100644 (file)
@@ -10,8 +10,6 @@
 <script>
 
 description("Test IndexedDB undefined as record value");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -25,12 +23,13 @@ function test()
     shouldBeFalse("IDBKeyRange == null");
 
     shouldThrow("indexedDB.open();");
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 44041b2..83d8e97 100644 (file)
@@ -10,8 +10,6 @@
 <script>
 
 description("Test IndexedDB odd value datatypes");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -40,12 +38,13 @@ function openNextDatabase()
     debug("opening a database named " + testData[nextToOpen].description);
     request = evalAndLog("indexedDB.open(testData[nextToOpen].name, testData[nextToOpen].description)");
     request.onerror = unexpectedErrorCallback;
-    request.onsuccess = ++nextToOpen < testData.length ? openNextDatabase : done;
+    request.onsuccess = ++nextToOpen < testData.length ? openNextDatabase : finishJSTest;
 }
 
 
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 109a7d2..1617a7b 100644 (file)
@@ -9,8 +9,6 @@
 <script>
 
 description("Tests IndexedDB's quota enforcing mechanism.");
-if (window.layoutTestController) 
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -79,7 +77,7 @@ function addData()
             store = event.target.source;
     } else {
         testFailed("added more than quota");
-        done();
+        finishJSTest();
         return;
     }
     dataAdded += 65536;
@@ -97,12 +95,13 @@ function logError()
 function testComplete()
 {
     testPassed("Adding data failed due to quota error. Data added was about " + Math.round(dataAdded / 1024 / 1024) + " MB");
-    done();
+    finishJSTest();
 }
 
 test();
 
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index c374d55..ab0f5cf 100644 (file)
@@ -9,8 +9,6 @@
 <script>
 
 description("Ensure that IDBDatabase objects are deleted when there are no retaining paths left");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 
 function test() {
@@ -52,12 +50,13 @@ function setVersion()
     var versionChangeRequest = evalAndLog("db.setVersion('version 1')");
     versionChangeRequest.onerror = unexpectedErrorCallback;
     versionChangeRequest.onblocked = unexpectedBlockedCallback;
-    versionChangeRequest.onsuccess = done;
+    versionChangeRequest.onsuccess = finishJSTest;
 }
 
 
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 7e4bca4..5cab905 100644 (file)
@@ -9,8 +9,6 @@
 <script>
 
 description("Test IndexedDB's IDBObjectStore.delete(IDBKeyRange) method.");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -92,7 +90,7 @@ function runTests()
             trans.onabort = unexpectedAbortCallback;
             trans.oncomplete = nextTest;
         } else {
-            done();
+            finishJSTest();
             return;
         }
     }
@@ -102,5 +100,6 @@ function runTests()
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 4a70743..d847b5b 100644 (file)
@@ -2,7 +2,6 @@
 <html>
 <head>
 <script src="../../fast/js/resources/js-test-pre.js"></script>
-<script src="../../fast/js/resources/js-test-post-function.js"></script>
 <script src="resources/shared.js"></script>
 </head>
 <body>
@@ -11,8 +10,6 @@
 <script>
 
 description("Test IndexedDB deleteIndex method");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -57,11 +54,12 @@ function postTwiddling()
 {
     evalAndExpectException("db.createObjectStore('bar');", "IDBDatabaseException.NOT_ALLOWED_ERR");
     evalAndExpectException("objectStore.deleteIndex('second')", "IDBDatabaseException.TRANSACTION_INACTIVE_ERR");
-    done();
+    finishJSTest();
 }
 
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index f526c18..6b9d1ad 100644 (file)
@@ -10,8 +10,6 @@
 <script>
 
 description("Test IndexedDB deleteObjectStore required argument");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -45,12 +43,13 @@ function createAndPopulateObjectStore()
     deleteAllObjectStores(db);
 
     shouldThrow("db.deleteObjectStore();");
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 87c9a59..56a621d 100644 (file)
@@ -10,8 +10,6 @@
 <script>
 
 description("Test IndexedDB deleteObjectStore required argument");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -46,12 +44,13 @@ function createAndPopulateObjectStore()
 
     evalAndLog("db.createObjectStore('null');");
     evalAndLog("db.deleteObjectStore(null);");
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 9685309..423607b 100644 (file)
@@ -9,8 +9,6 @@
 <script>
 
 description("Verify that you can put the same data in 2 different databases without uniqueness constraints firing.");
-if (window.layoutTestController) 
-    layoutTestController.waitUntilDone();
 
 testCount = 0;
 function test()
@@ -166,12 +164,13 @@ function last()
     if (testCount == 1)
         test();
     else
-        done();
+        finishJSTest();
 }
 
 test();
 
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 400e8b2..7c1025d 100644 (file)
@@ -9,8 +9,6 @@
 <script>
 
 description("Verify that a transaction with an error aborts unless preventDefault() is called.");
-if (window.layoutTestController) 
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -101,12 +99,13 @@ function transactionAborted1()
 function transactionAborted2()
 {
     testPassed("Transaction aborted");
-    done();
+    finishJSTest();
 }
 
 test();
 
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 4b9f869..04becde 100644 (file)
@@ -1,5 +1,5 @@
-CONSOLE MESSAGE: line 63: Uncaught this exception is expected
-CONSOLE MESSAGE: line 63: Uncaught this exception is expected
+CONSOLE MESSAGE: line 61: Uncaught this exception is expected
+CONSOLE MESSAGE: line 61: Uncaught this exception is expected
 Test exceptions in IDBRequest handlers cause aborts.
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
index bb0b5df..a2dc2c2 100644 (file)
@@ -9,8 +9,6 @@
 <script>
 
 description("Test exceptions in IDBRequest handlers cause aborts.");
-if (window.layoutTestController) 
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -121,12 +119,13 @@ function transactionCompleted2()
     debug("");
     testPassed("The transaction completed.");
     debug("");
-    done();
+    finishJSTest();
 }
 
 test();
 
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 3833aff..6afec0f 100644 (file)
@@ -9,8 +9,6 @@
 <script>
 
 description("Test the basics of IndexedDB's IDBFactory.");
-if (window.layoutTestController) 
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -84,12 +82,13 @@ function getDatabaseNamesSuccess3()
 
 function deleteDatabaseSuccess2()
 {
-    done();
+    finishJSTest();
 }
 
 test();
 
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 818a619..79f460f 100644 (file)
@@ -9,8 +9,6 @@
 <script>
 
 description("Test IndexedDB key comparison using IDBFactory.cmp().");
-if (window.layoutTestController) 
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -24,7 +22,7 @@ function test()
     testValidKeys();
     testInvalidKeys();
     testIdenticalKeys();
-    done();
+    finishJSTest();
 }
 
 function testValidKeys()
@@ -152,5 +150,6 @@ function testIdenticalKeys()
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 66f52eb..c3b9174 100644 (file)
@@ -9,8 +9,6 @@
 <script>
 
 description("Test the deleteDatabase call and its interaction with open/setVersion");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function Connection(id) {
     id = String(id);
@@ -187,12 +185,13 @@ function test3() {
                                "h.close",
                                "deleteDatabase().onsuccess"
                                ].toString());
-        done();
+        finishJSTest();
     }
 }
 
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 5b79957..467e1f0 100644 (file)
@@ -9,8 +9,6 @@
 <script>
 
 description("Test IndexedDB's webkitIndexedDB.deleteDatabase().");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -91,10 +89,11 @@ function verifyNotFound()
 {
     shouldBe("db.objectStoreNames.length", "0");
 
-    done();
+    finishJSTest();
 }
 
 test();
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 0f831fe..65aa5d2 100644 (file)
@@ -9,8 +9,6 @@
 <script>
 
 description("Test IndexedDB's IDBIndex.count().");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -125,7 +123,7 @@ function verifyCountWithKey()
     trans = evalAndLog("trans = db.transaction('storeName', IDBTransaction.READ_ONLY)");
     shouldBeTrue("trans != null");
     trans.onabort = unexpectedAbortCallback;
-    trans.oncomplete = done;
+    trans.oncomplete = finishJSTest;
 
     store = evalAndLog("store = trans.objectStore('storeName')");
     shouldBeTrue("store != null");
@@ -164,5 +162,6 @@ function verifyCountWithKey()
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 77dadaf..b653c00 100644 (file)
@@ -9,8 +9,6 @@
 <script> 
 
 description("Test IndexedDB's webkitIDBIndex.openCursor + the cursor it produces in depth.");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
  
 // In order of how it should be sorted by IndexedDB.
 window.testData = [
@@ -240,7 +238,7 @@ function testNullKeyRange()
         window.expectedIndex = upper;
         window.nullKeyRangeStep = 2;
     } else {
-        done();
+        finishJSTest();
         return;
     }
 
@@ -255,5 +253,6 @@ function testNullKeyRange()
 openDatabase(); // The first step.
  
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 9670f21..e236d9c 100644 (file)
@@ -10,8 +10,6 @@
 <script>
 
 description("Test IndexedDB index .get() required argument");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -48,12 +46,13 @@ function createAndPopulateObjectStore()
     index = evalAndLog("index = objectStore.createIndex('first', 'first');");
     shouldThrow("index.get();");
     shouldThrow("index.getKey();");
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index dfc1408..9f96eff 100644 (file)
@@ -9,8 +9,6 @@
 <script>
 
 description("Test features of IndexedDB's multiEntry indices.");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -140,7 +138,7 @@ function createIndexOnStoreWithData()
         var trans = evalAndLog("trans = event.target.result");
         shouldBeTrue("trans !== null");
         trans.onabort = unexpectedAbortCallback;
-        trans.oncomplete = function() { verifyIndexes('index-new', done); };
+        trans.oncomplete = function() { verifyIndexes('index-new', finishJSTest); };
 
         store = evalAndLog("store = trans.objectStore('store')");
         evalAndLog("store.createIndex('index-new', 'x', {multiEntry: true})");
@@ -150,6 +148,7 @@ function createIndexOnStoreWithData()
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
 
index cff9f47..38a62e4 100644 (file)
@@ -9,8 +9,6 @@
 <script>
 
 description("Test features of IndexedDB's unique indices.");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -136,13 +134,14 @@ function finalAddSuccess() {
     // An overwrite should be ok.
     request = evalAndLog("transaction.objectStore('store').put({x: 1}, 'baz')");
     request.onerror = unexpectedErrorCallback;
-    request.onsuccess = done;
+    request.onsuccess = finishJSTest;
 }
 
 test();
 
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
 
index 779e8eb..87e45da 100644 (file)
@@ -10,8 +10,6 @@
 <script>
 
 description("Test IndexedDB invalid keys");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -69,12 +67,13 @@ function testInvalidKeys()
         evalAndExpectException("request = objectStore.put('value', " + key + ")", "IDBDatabaseException.DATA_ERR");
     });
     
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 2124045..55a1345 100644 (file)
@@ -9,8 +9,6 @@
 <script>
 
 description("Test IndexedDB's key generator behavior.");
-if (window.layoutTestController) 
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -40,7 +38,7 @@ function runTests() {
 
     function nextTest() {
         if (!tests.length) {
-            done();
+            finishJSTest();
             return;
         }
 
@@ -219,5 +217,6 @@ defineTest(
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 9c670d2..dde0e0c 100644 (file)
@@ -10,8 +10,6 @@
 <script>
 
 description("Test IndexedDB key comparison");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -92,7 +90,7 @@ function openACursor()
             evalAndLog("keyIndex++;");
         }
         else {
-            done();
+            finishJSTest();
         }
     }
 }
@@ -101,5 +99,6 @@ function openACursor()
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 5fed49b..c719ad1 100644 (file)
@@ -10,8 +10,6 @@
 <script>
 
 description("Test IndexedDB key comparison");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -89,7 +87,7 @@ function openACursor()
             evalAndLog("keyIndex++;");
         }
         else {
-            done();
+            finishJSTest();
         }
     }
 }
@@ -98,5 +96,6 @@ function openACursor()
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 92fcc06..e165032 100644 (file)
@@ -10,8 +10,6 @@
 <script>
 
 description("Test IndexedDB key types");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -202,11 +200,12 @@ function testDepthLimits()
     evalAndExpectException("indexedDB.cmp(makeArrayOfDepth(2500), 0)", "IDBDatabaseException.DATA_ERR");
     debug("");
 
-    done();
+    finishJSTest();
 }
 
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 68c08ea..7241f7b 100644 (file)
@@ -10,8 +10,6 @@
 <script>
 
 description("Test IndexedDB key types");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -61,12 +59,13 @@ function testGroup2()
 
 function testGroup3()
 {
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 86ed325..223d64f 100644 (file)
@@ -10,8 +10,6 @@
 <script>
 
 description("Test for valid and invalid keypaths");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -101,12 +99,13 @@ function testInvalidKeyPaths()
         deleteAllObjectStores(db);
     });
 
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index f8c9049..ed8a268 100644 (file)
@@ -10,8 +10,6 @@
 <script>
 
 description("Test IndexedDB keyPath edge cases");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -117,11 +115,12 @@ function testKeyPathsAndGenerator()
     };
 
     transaction.onabort = unexpectedAbortCallback;
-    transaction.oncomplete = done;
+    transaction.oncomplete = finishJSTest;
 }
 
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 4a93359..965ecb8 100644 (file)
@@ -10,8 +10,6 @@
 <script>
 
 description("Test IndexedDB keyPaths");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -90,7 +88,7 @@ function checkCursor()
     if (++nextToOpen < testData.length) {
         createAndPopulateObjectStore();
     } else {
-        done();
+        finishJSTest();
     }
 }
 
@@ -98,5 +96,6 @@ function checkCursor()
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index b49fa78..06287cc 100644 (file)
@@ -10,8 +10,6 @@
 <script>
 
 description("Test IndexedDB keyrange required arguments");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -30,12 +28,13 @@ function test()
     shouldThrow("IDBKeyRange.bound(1);");
     shouldThrow("IDBKeyRange.bound();");
 
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index ba9adfa..7b00194 100644 (file)
@@ -9,8 +9,6 @@
 <script>
 
 description("Test IndexedDB's KeyRange.");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function checkSingleKeyRange(value)
 {
@@ -190,8 +188,9 @@ function test()
 
 test();
 
-done();
+finishJSTest();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 08fd54f..74a4947 100644 (file)
@@ -10,8 +10,6 @@
 <script>
 
 description("Test string list ordering in IndexedDB.");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 var expected_order = [
   "",
@@ -87,7 +85,7 @@ function testStoresAndIndexes()
 
                 shouldBeTrue("areArraysEqual(store.indexNames, expected_order)");
 
-                trans.oncomplete = done;
+                trans.oncomplete = finishJSTest;
             };
         };
     };
@@ -96,5 +94,6 @@ function testStoresAndIndexes()
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 0da1fd6..d6e9148 100644 (file)
@@ -16,8 +16,6 @@
 <script>
 
 description("Test IndexedDB behavior adding the same property twice");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -64,13 +62,14 @@ function addFirstSuccess()
 function addSecondExpectedError()
 {
     shouldBe("event.target.errorCode", "IDBDatabaseException.CONSTRAINT_ERR");
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
 
index 2fb91da..faa0d69 100644 (file)
@@ -16,8 +16,6 @@
 <script>
 
 description("Test IndexedDB indexes against autoincrementing keys");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -89,13 +87,14 @@ function checkSecondIndexAndPrepareThird()
 function checkThirdIndex()
 {
     shouldBe("event.target.result.id", "key");
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
 
index 2bb6cec..b2d9111 100644 (file)
@@ -16,8 +16,6 @@
 <script>
 
 description("Test IndexedDB adding property with invalid keypath");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -55,13 +53,14 @@ function cleanDatabase()
 function addFirstSuccess()
 {
     evalAndExpectException("request = objectStore.add({});", "IDBDatabaseException.DATA_ERR");
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
 
index 185169c..1e9756d 100644 (file)
@@ -16,8 +16,6 @@
 <script>
 
 description("Test IndexedDB's clearing an object store");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -67,13 +65,14 @@ function areWeClearYet()
 {
     cursor = evalAndLog("cursor = request.result;");
     shouldBe("cursor", "null");
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
 
index 65ab46f..27309a0 100644 (file)
@@ -16,8 +16,6 @@
 <script>
 
 description("Test IndexedDB's creating unique index and updating indexNames");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -68,13 +66,14 @@ function createAndVerifyIndex()
     shouldBe("event.target.transaction.db", "db");
     shouldBe("event.target.transaction.readyState", "IDBTransaction.LOADING");
     shouldBe("event.target.transaction.mode", "IDBTransaction.VERSION_CHANGE");
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
 
index b71bfea..ce9ec9b 100644 (file)
@@ -16,8 +16,6 @@
 <script>
 
 description("Test IndexedDB's creating index with integer keys");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -63,13 +61,14 @@ function verifyKeyCursor()
     shouldBeFalse("cursor == null");
     shouldBe("cursor.key", "data.num");
     shouldBe("cursor.primaryKey", "data.id");
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
 
index c064747..408fe4b 100644 (file)
@@ -16,8 +16,6 @@
 <script>
 
 description("Test IndexedDB's creating object store and updating properties");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -73,13 +71,14 @@ function cleanDatabase()
         shouldBe("event.target.transaction.mode", "IDBTransaction.VERSION_CHANGE");
     }
 
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
 
index 9cb1b8c..f77b7a7 100644 (file)
@@ -16,8 +16,6 @@
 <script>
 
 description("Test IndexedDB's creating object store with null name");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -49,13 +47,14 @@ function cleanDatabase()
     objectStore = evalAndLog("objectStore = db.createObjectStore(null);");
     shouldBe("objectStore.name", "'null'");
 
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
 
index 0c14695..ea89537 100644 (file)
@@ -16,8 +16,6 @@
 <script>
 
 description("Test IndexedDB's cursor mutation during object store cursor iteration");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -148,12 +146,13 @@ function checkMutatingCursorResults()
     shouldBe("count", "objectStoreData.length");
     shouldBe("sawAdded", "true");
     shouldBe("sawRemoved", "true");
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index d6b09f1..8092a7b 100644 (file)
@@ -16,8 +16,6 @@
 <script>
 
 description("Test IndexedDB's cursor mutation");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -188,12 +186,13 @@ function checkMutatingCursorResults()
     shouldBe("count", "objectStoreData.length - 1");
     shouldBe("sawAdded", "true");
     shouldBe("sawRemoved", "false");
-    done();
+    finishJSTest();
 }
 
 test();
 
 </script>
+<script src="../../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
 
index eb0c0bf..1b9f04b 100644 (file)
@@ -16,8 +16,6 @@
 <script>
 
 description("Test IndexedDB: mutating records with a r/w cursor updates indexes on those records");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -63,7 +61,7 @@ function setVersion()
         request.onsuccess = setupObjectStoreAndCreateIndexAndAdd;
         request.onerror = unexpectedErrorCallback;
     } else {
-        done();
+        finishJSTest();
     }
 }
 
@@ -128,6 +126,7 @@ function checkIndex2()
 test();
 
 </script>
+<script src="../../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
 
index bdfd52a..d844c7a 100644 (file)
@@ -16,8 +16,6 @@
 <script>
 
 description("Test IndexedDB cursor behavior");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -395,7 +393,7 @@ function testGroup15()
       }
       else {
         shouldBe("keyIndex", "-1");
-        done();
+        finishJSTest();
       }
     }
 }
@@ -404,6 +402,7 @@ function testGroup15()
 test();
 
 </script>
+<script src="../../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
 
index 2a5f4ea..40ac1f3 100644 (file)
@@ -16,8 +16,6 @@
 <script>
 
 description("Test IndexedDB: result property after deleting existing and non-existing record");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -67,11 +65,12 @@ function deleteRecord2()
 function finalCheck()
 {
     shouldBe("event.target.result", "undefined");
-    done();
+    finishJSTest();
 }
 
 test();
 
 </script>
+<script src="../../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index d96a0b9..7110fd5 100644 (file)
@@ -16,8 +16,6 @@
 <script>
 
 description("Test IndexedDB's event.target.source in success callbacks");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -60,13 +58,14 @@ function areWeDoneYet()
 {
     source = evalAndLog("source = event.target.source;");
     shouldBe("source", "objectStore");
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
 
index aef3686..73698d4 100644 (file)
@@ -16,8 +16,6 @@
 <script>
 
 description("Test IndexedDB's opening DB more than once");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -74,13 +72,14 @@ function open2Success()
     shouldBe("objectStore2.name", "objectStoreName");
     shouldBe("objectStore2.keyPath", "objectStoreOptions.keyPath");
 
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
 
index 50213b3..892b3e1 100644 (file)
@@ -16,8 +16,6 @@
 <script>
 
 description("Test IndexedDB: iterating through index cursors with keys and key ranges");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -1015,7 +1013,7 @@ function testGroup30()
         }
         else {
             shouldBe("keyIndex", "objectStoreDataNameSort.length");
-            done();
+            finishJSTest();
         }
     }
 }
@@ -1024,6 +1022,7 @@ function testGroup30()
 test();
 
 </script>
+<script src="../../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
 
index 044208e..5b7bca4 100644 (file)
@@ -16,8 +16,6 @@
 <script>
 
 description("Test IndexedDB's behavior deleting entry with no key");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -45,13 +43,14 @@ function cleanDatabaseAndCreateObjectStore()
     deleteAllObjectStores(db);
     objectStore = evalAndLog("objectStore = db.createObjectStore('bar');");
     evalAndExpectException("objectStore.delete(null);", "webkitIDBDatabaseException.DATA_ERR");
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
 
index fba824f..f5b2902 100644 (file)
@@ -16,8 +16,6 @@
 <script>
 
 description("Test IndexedDB's behavior adding inline and passed key simultaneously");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -47,12 +45,13 @@ function cleanDatabase()
     deleteAllObjectStores(db);
     objectStore = evalAndLog("objectStore = db.createObjectStore('baz', { keyPath: 'id' });");
     evalAndExpectException("objectStore.add({id: 5}, 5);", "webkitIDBDatabaseException.DATA_ERR");
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 525a368..b5865a2 100644 (file)
@@ -16,8 +16,6 @@
 <script>
 
 description("Test IndexedDB's behavior puting without key");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -47,13 +45,14 @@ function cleanDatabase()
     deleteAllObjectStores(db);
     objectStore = evalAndLog("objectStore = db.createObjectStore('bar');");
     evalAndExpectException("objectStore.put({});", "IDBDatabaseException.DATA_ERR");
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
 
index 7bfb61f..cf848d1 100644 (file)
@@ -16,8 +16,6 @@
 <script>
 
 description("Test IndexedDB's behavior put()ing with null key");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -47,13 +45,14 @@ function cleanDatabase()
     deleteAllObjectStores(db);
     objectStore = evalAndLog("objectStore = db.createObjectStore('bar');");
     evalAndExpectException("objectStore.put({}, null);", "IDBDatabaseException.DATA_ERR");
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
 
index ca534fd..80ed958 100644 (file)
@@ -16,8 +16,6 @@
 <script>
 
 description("Test IndexedDB's event.target.result after add() and put()");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -78,13 +76,14 @@ function postPut2()
 function postPut3()
 {
     shouldBe("event.target.result", "key2");
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
 
index e7dc5a7..229084d 100644 (file)
@@ -16,8 +16,6 @@
 <script>
 
 description("Test IndexedDB's index cursors");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -70,7 +68,7 @@ function postAdd()
             shouldBe("event.target.result.value.name", "'Ben'");
             if (++indexesFinished == numIndexes) {
                 if (autoIncrement) {
-                    done();
+                    finishJSTest();
                 } else {
                     setupAutoIncrement();
                 }
@@ -96,6 +94,7 @@ function setupAutoIncrement()
 test();
 
 </script>
+<script src="../../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
 
index 4de9daf..5c65d25 100644 (file)
@@ -16,8 +16,6 @@
 <script>
 
 description("Test IndexedDB: object identity");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -69,12 +67,13 @@ function testIdentitySomeMore()
     shouldBeFalse("index3 === index1");
     shouldBeFalse("index4 === index2");
 
-    done();
+    finishJSTest();
 }
 
 test();
 
 </script>
+<script src="../../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
 
index 4b092d7..ae80520 100644 (file)
@@ -16,8 +16,6 @@
 <script>
 
 description("Test IndexedDB adding an autoincremented key and retrieving it successfully");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -69,13 +67,14 @@ function getSuccess()
 {
     shouldBe("event.target.result.name", "test.storedObject.name");
     shouldBe("event.target.result.id", "id");
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
 
index 80f3278..6c8d9d6 100644 (file)
@@ -16,8 +16,6 @@
 <script>
 
 description("Test IndexedDB: adds, gets, deletes, and re-gets a record in a variety of different object store configurations");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -74,7 +72,7 @@ function setVersion()
         request.onsuccess = createObjectStore;
         request.onerror = unexpectedErrorCallback;
     } else {
-        done();
+        finishJSTest();
     }
 }
 
@@ -131,6 +129,7 @@ function finalCheck()
 test();
 
 </script>
+<script src="../../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
 
index bb94317..af6795f 100644 (file)
@@ -16,8 +16,6 @@
 <script>
 
 description("Test IndexedDB's objectStoreNames array");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -50,13 +48,14 @@ function cleanDatabase()
     shouldBeTrue("'objectStoreNames' in db");
     shouldBe("db.objectStoreNames.length", "1");
     shouldBe("db.objectStoreNames.item(0)", "objectStoreName");
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
 
index ef53fe3..b449a93 100644 (file)
@@ -16,8 +16,6 @@
 <script>
 
 description("Test IndexedDB: request result persists in setTimeout callback");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -126,12 +124,13 @@ function deleteRecord()
 function deleteSuccess()
 {
     debug("deleteSuccess():");
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index d71affb..b50af92 100644 (file)
@@ -16,8 +16,6 @@
 <script>
 
 description("Test IndexedDB: should NOT throw when opening a database with a null name");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -38,13 +36,14 @@ function openSuccess()
 {
     db = evalAndLog("db = event.target.result");
     shouldBe("db.name", "'null'");
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
 
index a6781a3..e5c7ba9 100644 (file)
@@ -16,8 +16,6 @@
 <script>
 
 description("Test IndexedDB's putting and getting values in an object store");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -111,13 +109,14 @@ function postAddIntAutoIncrement()
 function postGetIntAutoIncrement()
 {
     shouldBe("event.target.result", "testInt.value");
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
 
index 062b728..71aa11e 100644 (file)
@@ -16,8 +16,6 @@
 <script>
 
 description("Test IndexedDB's readonly transactions");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -58,13 +56,14 @@ function cleanDatabase()
     evalAndExpectException("db.transaction(osName).objectStore(osName).put({}, key1);", "IDBDatabaseException.READ_ONLY_ERR");
     evalAndExpectException("db.transaction([osName]).objectStore(osName).delete(key1);", "IDBDatabaseException.READ_ONLY_ERR");
     evalAndExpectException("db.transaction(osName).objectStore(osName).delete(key2);", "IDBDatabaseException.READ_ONLY_ERR");
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
 
index ecb136d..2ddbab4 100644 (file)
@@ -16,8 +16,6 @@
 <script>
 
 description("Test IndexedDB's read/write transactions");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -116,13 +114,14 @@ function postDelete()
 function postDelete2()
 {
     shouldBe("event.target.transaction.mode", "IDBTransaction.READ_WRITE");
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
 
index 18c96e0..979ac89 100644 (file)
@@ -16,8 +16,6 @@
 <script>
 
 description("Test IndexedDB readyState property during different operations");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -79,13 +77,14 @@ function finalCheck()
     debug("finalCheck():");
     shouldBe("request.readyState", "IDBRequest.DONE");
     shouldBeFalse("event.target.result == null");
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
 
index 8f9be5f..657970c 100644 (file)
@@ -16,8 +16,6 @@
 <script>
 
 description("Test IndexedDB's creating and deleting indexes");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -58,13 +56,14 @@ function createAndDeleteIndex()
     evalAndLog("objectStore.deleteIndex(indexName);");
     shouldBe("objectStore.indexNames.length", "0");
 
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
 
index 5ad347f..cb4c711 100644 (file)
@@ -16,8 +16,6 @@
 <script>
 
 description("Test IndexedDB deleting an object store");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -114,13 +112,14 @@ function postSetVersion3()
 function deleteThirdObjectStore()
 {
     evalAndLog("db.deleteObjectStore(objectStoreName);");
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
 
index a59eceb..97e4b42 100644 (file)
@@ -8,7 +8,6 @@
 <html>
 <head>
 <script src="../../../fast/js/resources/js-test-pre.js"></script>
-<script src="../../../fast/js/resources/js-test-post-function.js"></script>
 <script src="../resources/shared.js"></script>
 </head>
 <body>
@@ -17,8 +16,6 @@
 <script>
 
 description("Test IndexedDB's aborting setVersion");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -61,12 +58,13 @@ function postAbort()
     shouldBe("db.version", "initialVersion");
     shouldBe("db.objectStoreNames.length", "0");
 
-    done();
+    finishJSTest();
 }
 
 test();
 
 </script>
+<script src="../../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
 
index f4e8d00..48ef947 100644 (file)
@@ -16,8 +16,6 @@
 <script>
 
 description("Test IndexedDB's triggering versionchange event");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -106,13 +104,14 @@ function postSetVersion2()
     shouldBe("event.target.transaction.mode", "IDBTransaction.VERSION_CHANGE");
     shouldBe("db3.version", "'2'");
     shouldBe("versionChangeEventCount", "3");
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
 
index 4734127..34f2829 100644 (file)
@@ -9,8 +9,6 @@
 <script>
 
 description("Test mutating an IndexedDB's objectstore from a cursor.");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 test();
 
@@ -134,10 +132,11 @@ function reverseCursor()
 function reverseCursorComplete()
 {
     debug("reverseCursorComplete()");
-    done();
+    finishJSTest();
 }
 
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 54fcf4a..1f1ca61 100644 (file)
@@ -10,8 +10,6 @@
 <script>
 
 description("Test IndexedDB object store required arguments");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -53,12 +51,13 @@ function createAndPopulateObjectStore()
     shouldThrow("objectStore.createIndex('foo');");
     shouldThrow("objectStore.index();");
     shouldThrow("objectStore.deleteIndex();");
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 718e0e6..b1029c4 100644 (file)
@@ -9,8 +9,6 @@
 <script>
 
 description("Test IndexedDB's IDBObjectStore auto-increment feature.");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -163,7 +161,7 @@ function testLongKeyPath()
     debug("testLongKeyPath():");
     trans = evalAndLog("trans = db.transaction('StoreWithLongKeyPath', webkitIDBTransaction.READ_WRITE)");
     trans.onabort = unexpectedAbortCallback;
-    trans.oncomplete = done;
+    trans.oncomplete = finishJSTest;
 
     store = evalAndLog("store = trans.objectStore('StoreWithLongKeyPath')");
     request = evalAndLog("store.add({foo: 'bar'})");
@@ -201,5 +199,6 @@ test();
 
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 9f55e71..299589f 100644 (file)
@@ -9,8 +9,6 @@
 <script>
 
 description("Test IndexedDB's webkitIDBObjectStore.clear().");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -98,11 +96,12 @@ function getSuccess()
 {
     shouldBeEqualToString("event.target.result", "value");
 
-    done();
+    finishJSTest();
 }
 
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index f144efe..2b43c8b 100644 (file)
@@ -9,8 +9,6 @@
 <script>
 
 description("Test IndexedDB's IDBObjectStore.count().");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -118,7 +116,7 @@ function verifyCountWithKey()
     trans = evalAndLog("trans = db.transaction('storeName', IDBTransaction.READ_ONLY)");
     shouldBeTrue("trans != null");
     trans.onabort = unexpectedAbortCallback;
-    trans.oncomplete = done;
+    trans.oncomplete = finishJSTest;
 
     store = evalAndLog("store = trans.objectStore('storeName')");
     shouldBeTrue("store != null");
@@ -154,5 +152,6 @@ function verifyCountWithKey()
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 7ab26db..b2b1049 100644 (file)
@@ -9,8 +9,6 @@
 <script> 
 
 description("Test IndexedDB's objectStore.openCursor + the cursor it produces in depth.");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
  
 // In order of how it should be sorted by IndexedDB.
 window.testData = [
@@ -217,7 +215,7 @@ function testNullKeyRange()
         window.expectedIndex = upper;
         window.nullKeyRangeStep = 2;
     } else {
-        done();
+        finishJSTest();
         return;
     }
 
@@ -232,5 +230,6 @@ function testNullKeyRange()
 openDatabase(); // The first step.
  
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index a6d692e..4aa37bd 100644 (file)
@@ -9,8 +9,6 @@
 <script>
 
 description("Test IndexedDB's webkitIDBObjectStore.deleteObjectStore().");
-if (window.layoutTestController) 
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -97,11 +95,12 @@ function verifyNotFound()
     shouldBe("event.target.result", "undefined");
     shouldBeFalse("event.target.source.indexNames.contains('indexName')");
 
-    done();
+    finishJSTest();
 }
 
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 3c8badf..f322e55 100644 (file)
@@ -10,8 +10,6 @@
 <script>
 
 description("Test IndexedDB odd value datatypes");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -109,7 +107,7 @@ function openCursorSuccess()
         debug("");
         verifyNextDatabase();
     } else {
-        done();
+        finishJSTest();
     }
 }
 
@@ -117,5 +115,6 @@ function openCursorSuccess()
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index e24bae2..cdbb0ca 100644 (file)
@@ -9,8 +9,6 @@
 <script>
 
 description("Test interleaved open/close/setVersion calls in various permutations");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function Connection(id) {
     id = String(id);
@@ -285,12 +283,13 @@ function test6() {
                                "h1.setVersion.onsuccess",
                                "h1.setVersion.transaction-complete"
                                ].toString());
-        done();
+        finishJSTest();
     }
 }
 
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 05728d8..6dbec16 100644 (file)
@@ -9,14 +9,12 @@
 <script>
 
 description("Test IndexedDB's openCursor.");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function emptyCursorSuccess()
 {
     debug("Empty cursor opened successfully.")
     // FIXME: check that we can iterate the cursor.
-    done();
+    finishJSTest();
 }
 
 function openEmptyCursor()
@@ -91,5 +89,6 @@ test();
 
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 5be700f..56bd157 100644 (file)
@@ -10,8 +10,6 @@
 <script>
 
 description("Test IndexedDB opening database connections during transactions");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -54,7 +52,7 @@ function startTransaction()
     trans.oncomplete = function (e) {
         debug("transaction complete");
         shouldBeEqualToString("state", "open3complete");
-        done();
+        finishJSTest();
     };
 
     debug("");
@@ -90,5 +88,6 @@ function tryOpens()
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index a02ceab..ebeeac2 100644 (file)
@@ -9,8 +9,6 @@
 <script>
 
 description("Verify that queuing up several commands works (and they all fire).");
-if (window.layoutTestController) 
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -60,7 +58,7 @@ function verifyAdd(expected)
     shouldBe("" + addCount++, "" + expected);
 
     if (addCount == 3)
-        done();
+        finishJSTest();
     if (addCount > 3)
         testFailed("Unexpected call to verifyAdd!");
 }
@@ -69,5 +67,6 @@ test();
 
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index cdccbd6..be2590b 100644 (file)
@@ -9,8 +9,6 @@
 <div id="console"></div>
 <script>
 description("Test IndexedDB readonly properties");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function setReadonlyProperty(property, value)
 {
@@ -57,12 +55,13 @@ function createAndPopulateObjectStore()
     deleteAllObjectStores(db);
     objectStore = evalAndLog("objectStore = db.createObjectStore('foo');");
     setReadonlyProperty("objectStore.transaction", "this");
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 1c36672..2d1b3ae 100644 (file)
@@ -9,8 +9,6 @@
 <div id="console"></div>
 <script>
 description("Test IndexedDB readonly properties");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function setReadonlyProperty(property, value)
 {
@@ -114,12 +112,13 @@ function checkCursor()
     setReadonlyProperty("keyRange.lowerOpen", "true");
     setReadonlyProperty("keyRange.upperOpen", "true");
 
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index e77356c..113fc8c 100644 (file)
@@ -9,8 +9,6 @@
 <script>
 
 description("Test event propogation on IDBRequest.");
-if (window.layoutTestController) 
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -266,7 +264,7 @@ function transactionComplete()
     shouldBeFalse("dbBubbleFired");
     debug("");
 
-    done();
+    finishJSTest();
     return;
 }
 
@@ -274,5 +272,6 @@ test();
 
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index cd1baac..52c3f53 100644 (file)
@@ -24,41 +24,34 @@ if (self.importScripts && !self.postMessage) {
     };
 }
 
-function done()
-{
-    isSuccessfullyParsed();
-    if (self.layoutTestController)
-        layoutTestController.notifyDone()
-}
-
 function unexpectedSuccessCallback()
 {
     testFailed("Success function called unexpectedly.");
-    done();
+    finishJSTest();
 }
 
 function unexpectedErrorCallback(event)
 {
     testFailed("Error function called unexpectedly: (" + event.target.errorCode + ") " + event.target.webkitErrorMessage);
-    done();
+    finishJSTest();
 }
 
 function unexpectedAbortCallback()
 {
     testFailed("Abort function called unexpectedly!");
-    done();
+    finishJSTest();
 }
 
 function unexpectedCompleteCallback()
 {
     testFailed("oncomplete function called unexpectedly!");
-    done();
+    finishJSTest();
 }
 
 function unexpectedBlockedCallback()
 {
     testFailed("onblocked called unexpectedly");
-    done();
+    finishJSTest();
 }
 
 function evalAndExpectException(cmd, expected)
index 0cd0624..deafbea 100644 (file)
@@ -10,8 +10,6 @@
 <script> 
  
 description("Test IndexedDB with null version string");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
  
 function test()
 {
@@ -43,12 +41,13 @@ function openSuccess()
 function postSetVersion()
 {
     shouldBe("db.version", "'null'");
-    done();
+    finishJSTest();
 }
  
  
 test();
  
-</script> 
+</script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body> 
 </html>
index 90b3c9a..92df9ff 100644 (file)
@@ -10,8 +10,6 @@
 <script> 
  
 description("Test IndexedDB version string is required");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
  
 function test()
 {
@@ -36,12 +34,13 @@ function openSuccess()
     db = evalAndLog("db = event.target.result");
  
     shouldThrow("db.setVersion();");
-    done();
+    finishJSTest();
 }
  
  
 test();
  
-</script> 
+</script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body> 
 </html>
index 31922fc..8fb6432 100644 (file)
@@ -9,8 +9,6 @@
 <script>\r
 \r
 description("An open connection blocks a separate connection's setVersion call");\r
-if (window.layoutTestController)\r
-    layoutTestController.waitUntilDone();\r
 \r
 connections = []\r
 function test()\r
@@ -60,12 +58,13 @@ function inSetVersion()
     debug("in setVersion.onsuccess");\r
     shouldBeTrue("seen_blocked_event");\r
     deleteAllObjectStores(connections[0]);\r
-    done();\r
+    finishJSTest();\r
 }\r
 \r
 \r
 test();\r
 \r
 </script>\r
+<script src="../../fast/js/resources/js-test-post.js"></script>\r
 </body>\r
 </html>\r
index 7975709..c3c73da 100644 (file)
@@ -9,8 +9,6 @@
 <script>\r
 \r
 description("4 open connections try to setVersion at the same time.  3 connections eventually close, allowing 1 setVersion call to proceed.");\r
-if (window.layoutTestController)\r
-    layoutTestController.waitUntilDone();\r
 \r
 connections = []\r
 function test()\r
@@ -126,12 +124,13 @@ function inSetVersion1(event)
 {\r
     debug("")\r
     testPassed("connection[1] got into SetVersion");\r
-    done();\r
+    finishJSTest();\r
 }\r
 \r
 \r
 test();\r
 \r
 </script>\r
+<script src="../../fast/js/resources/js-test-post.js"></script>\r
 </body>\r
 </html>\r
index e11390c..4c005ae 100644 (file)
@@ -10,8 +10,6 @@
 <script>
 
 description("Test structured clone permutations in IndexedDB. File/FileList tests require DumpRenderTree.");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 if (window.eventSender) {
     var fileInput = document.getElementById("fileInput");
@@ -347,7 +345,7 @@ function readBlobAsText(blob, callback)
     };
     reader.onerror = function(e) {
         testFailed("Error reading blob as text: " + e);
-        done();
+        finishJSTest();
     };
     reader.readAsText(blob);
 }
@@ -526,7 +524,7 @@ function testBadTypes()
     evalAndLog("store = transaction.objectStore('storeName')");
     transaction.onerror = unexpectedErrorCallback;
     transaction.oncomplete = unexpectedCompleteCallback;
-    transaction.onabort = done;
+    transaction.onabort = finishJSTest;
 
     debug("");
     debug("Other JavaScript object types:");
@@ -543,5 +541,6 @@ function testBadTypes()
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index b278565..7654590 100644 (file)
@@ -18,8 +18,6 @@ var db;
 var body = document.getElementsByTagName("iframe")[0].contentDocument.body;
 
 description("Test that pending transactions are not aborted during recursive JS calls until all JS (in all frames) is finished.");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function setup() {
     shouldBeTrue("'webkitIndexedDB' in window");
@@ -63,11 +61,12 @@ function test()
 function abortCallback()
 {
     debug("Pending transaction aborted");
-    done();
+    finishJSTest();
 }
 
 setup();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 001b537..1731b75 100644 (file)
@@ -14,8 +14,6 @@ var db;
 var body = document.getElementsByTagName("body")[0];\r
 \r
 description("Test that pending transactions are not aborted during recursive JS calls until all JS is finished.");\r
-if (window.layoutTestController)\r
-    layoutTestController.waitUntilDone();\r
 \r
 function setup() {\r
     shouldBeTrue("'webkitIndexedDB' in window");\r
@@ -59,11 +57,12 @@ function test()
 function abortCallback()\r
 {\r
     debug("Pending transaction aborted");\r
-    done();\r
+    finishJSTest();\r
 }\r
 \r
 setup();\r
 \r
 </script>\r
+<script src="../../fast/js/resources/js-test-post.js"></script>\r
 </body>\r
 </html>\r
index debba62..697b2dc 100644 (file)
@@ -9,8 +9,6 @@
 <script>
 
 description("Test transaction aborts send the proper onabort messages..");
-if (window.layoutTestController) 
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -96,12 +94,13 @@ function transactionAborted()
     abortFired = true;
 
     evalAndExpectException("store.add({x: 'value5', y: 'zzz5'}, 'key5')", "IDBDatabaseException.TRANSACTION_INACTIVE_ERR");
-    done();
+    finishJSTest();
 }
 
 test();
 
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 59e8f5b..d050ca3 100644 (file)
@@ -9,8 +9,6 @@
 <script>\r
 \r
 description("Test closing a database connection in IndexedDB.");\r
-if (window.layoutTestController)\r
-    layoutTestController.waitUntilDone();\r
 \r
 function test()\r
 {\r
@@ -78,7 +76,7 @@ function onSecondOpen() {
     request = evalAndLog("request = store.put('1', '2')");\r
     request.onsuccess = onFinalPutSuccess;\r
     request.onerror = unexpectedErrorCallback;\r
-    currentTransaction.oncomplete = done;\r
+    currentTransaction.oncomplete = finishJSTest;\r
     currentTransaction.onabort = unexpectedAbortCallback;\r
 }\r
 \r
@@ -90,5 +88,6 @@ function onFinalPutSuccess() {
 test();\r
 \r
 </script>\r
+<script src="../../fast/js/resources/js-test-post.js"></script>\r
 </body>\r
 </html>\r
index cd50e61..c0775ca 100644 (file)
@@ -9,8 +9,6 @@
 <script>
 
 description("Test IndexedDB's transaction and objectStore calls");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -126,11 +124,12 @@ function afterComplete()
     evalAndExpectException("trans.objectStore('store')", "webkitIDBDatabaseException.NOT_ALLOWED_ERR");
     evalAndExpectException("store.index('index')", "webkitIDBDatabaseException.NOT_ALLOWED_ERR");
 
-    done();
+    finishJSTest();
 }
 
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 80c2d13..92c60f3 100644 (file)
@@ -9,8 +9,6 @@
 <script>
 
 description("Test IndexedDB transaction does not crash on abort.");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -36,12 +34,13 @@ function setVersionSuccess()
     evalAndLog("db.createObjectStore('foo')");
     evalAndLog("db.transaction('foo')");
     evalAndLog("window.gc()");
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index b938885..a7de6ec 100644 (file)
@@ -9,8 +9,6 @@
 <script>
 
 description("Test event propogation on IDBTransaction.");
-if (window.layoutTestController) 
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -136,7 +134,7 @@ function completeFiredCallback()
     shouldBe("event.currentTarget", "trans");
     completeFired = true;
     debug("");
-    done();
+    finishJSTest();
 }
 
 function dbCompleteBubbleCallback()
@@ -151,5 +149,6 @@ test();
 
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 74e2a17..1d7b2a0 100644 (file)
@@ -9,8 +9,6 @@
 <script>\r
 \r
 description("Test read-only transactions in IndexedDB.");\r
-if (window.layoutTestController)\r
-    layoutTestController.waitUntilDone();\r
 \r
 function test()\r
 {\r
@@ -60,12 +58,13 @@ function gotCursor()
     shouldBeFalse("!event.target.result");\r
     evalAndExpectException("event.target.result.delete()", "webkitIDBDatabaseException.READ_ONLY_ERR");\r
 \r
-    done();\r
+    finishJSTest();\r
 }\r
 \r
 \r
 test();\r
 \r
 </script>\r
+<script src="../../fast/js/resources/js-test-post.js"></script>\r
 </body>\r
 </html>\r
index 8173952..3c930d0 100644 (file)
@@ -9,8 +9,6 @@
 <script>
 
 description("Test IndexedDB transaction rollback.");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -93,12 +91,13 @@ function getSuccess()
     shouldBe("event.target.result", "undefined");
 
     shouldBe("cursor.value", "'rollbackValue'");
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 8dd734a..fabe489 100644 (file)
@@ -10,8 +10,6 @@
 <script>
 
 description("Test IndexedDB: transaction storeNames required arguments");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -45,12 +43,13 @@ function createAndPopulateObjectStore()
     deleteAllObjectStores(db);
 
     shouldThrow("db.transaction();");
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index dc0395d..555071a 100644 (file)
@@ -9,8 +9,6 @@
 <script>
 
 description("Test behavior when the same connection calls setVersion twice");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 
 function test() {
@@ -100,7 +98,7 @@ function checkResults() {
         req.onerror = unexpectedErrorCallback;
         req.onsuccess = function (e) {
             shouldBeEqualToString("event.target.result", "bbb");
-            done();    
+            finishJSTest();
         };
     };
 }
@@ -109,5 +107,6 @@ function checkResults() {
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 0cd4c2f..7c643a0 100644 (file)
@@ -10,8 +10,6 @@
 <script>
 
 description("Test IndexedDB undefined as record value");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -75,12 +73,13 @@ function checkCursor()
     } else {
         testFailed("cursor is null");
     }
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 9385cb4..a062d96 100644 (file)
@@ -10,8 +10,6 @@
 <script>
 
 description("Test IndexedDB odd value datatypes");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test()
 {
@@ -85,7 +83,7 @@ function openACursor()
             evalAndLog("valueIndex++;");
         }
         else {
-            done();
+            finishJSTest();
         }
     }
 }
@@ -94,5 +92,6 @@ function openACursor()
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 304b1f4..5253590 100644 (file)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 84: Uncaught Error: This should *NOT* be caught!
+CONSOLE MESSAGE: line 82: Uncaught Error: This should *NOT* be caught!
 Ensure that aborted VERSION_CHANGE transactions are completely rolled back
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
index e18de1e..4f065f0 100644 (file)
@@ -10,8 +10,6 @@
 <script>
 
 description("Ensure that aborted VERSION_CHANGE transactions are completely rolled back");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 
 function test() {
@@ -96,11 +94,12 @@ function setVersion2Abort()
     shouldBeTrue("db.objectStoreNames.contains('store1')");
     shouldBeFalse("db.objectStoreNames.contains('store2')");
 
-    done();
+    finishJSTest();
 }
 
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 8158806..d76a70b 100644 (file)
@@ -9,8 +9,6 @@
 <script>
 
 description("Ensure VERSION_CHANGE transaction doesn't run concurrently with other transactions");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 
 function test() {
@@ -73,12 +71,13 @@ function openAgainSuccess()
 {
     debug("open() callback - this should appear after VERSION_CHANGE transaction ends");
     shouldBeEqualToString("window.state", "VERSION_CHANGE finished");
-    done();
+    finishJSTest();
 }
 
 
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>
index 0332807..207a45b 100644 (file)
@@ -10,8 +10,6 @@
 <script>
 
 description("Ensure that IDBVersionChangeRequest objects are not GC'd if they have pending events");
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
 
 function test() {
     evalAndLog("indexedDB = window.indexedDB || window.webkitIndexedDB || window.mozIndexedDB;");
@@ -70,11 +68,12 @@ function testSetVersion()
 function versionSuccess()
 {
     testPassed("setVersion's IDBVersionChangeRequest.onsuccess event fired");
-    done();
+    finishJSTest();
 }
 
 test();
 
 </script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
 </body>
 </html>