Diff
Modified: trunk/LayoutTests/ChangeLog (120521 => 120522)
--- trunk/LayoutTests/ChangeLog 2012-06-16 03:42:58 UTC (rev 120521)
+++ trunk/LayoutTests/ChangeLog 2012-06-16 03:54:33 UTC (rev 120522)
@@ -1,5 +1,23 @@
2012-06-15 Ryosuke Niwa <[email protected]>
+ Use testRunner instead of layoutTestController in fast/workers/storage tests
+ https://bugs.webkit.org/show_bug.cgi?id=89271
+
+ Reviewed by Adam Barth.
+
+ * fast/workers/storage/change-version-sync.html:
+ * fast/workers/storage/interrupt-database-sync.html-disabled:
+ * fast/workers/storage/interrupt-database.html:
+ * fast/workers/storage/resources/database-worker.js:
+ (onmessage):
+ * fast/workers/storage/resources/multiple-transactions-sync.js:
+ (checkCompletion):
+ * fast/workers/storage/resources/test-inputs-common.js:
+ (finishTest):
+ * fast/workers/storage/use-same-database-in-page-and-workers.html:
+
+2012-06-15 Ryosuke Niwa <[email protected]>
+
Use testRunner instead of layoutTestController in transforms, transitions, traversal, userscripts, webarchive, webaudio, and webintents tests
https://bugs.webkit.org/show_bug.cgi?id=89269
Modified: trunk/LayoutTests/fast/workers/storage/change-version-sync.html (120521 => 120522)
--- trunk/LayoutTests/fast/workers/storage/change-version-sync.html 2012-06-16 03:42:58 UTC (rev 120521)
+++ trunk/LayoutTests/fast/workers/storage/change-version-sync.html 2012-06-16 03:54:33 UTC (rev 120522)
@@ -8,15 +8,15 @@
function finishTest()
{
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
function runTest()
{
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
if (window.location.search == "?2") {
Modified: trunk/LayoutTests/fast/workers/storage/interrupt-database-sync.html-disabled (120521 => 120522)
--- trunk/LayoutTests/fast/workers/storage/interrupt-database-sync.html-disabled 2012-06-16 03:42:58 UTC (rev 120521)
+++ trunk/LayoutTests/fast/workers/storage/interrupt-database-sync.html-disabled 2012-06-16 03:54:33 UTC (rev 120522)
@@ -12,8 +12,8 @@
function finishTest()
{
log("PASS: database operations interrupted.");
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
function terminateWorker()
@@ -24,9 +24,9 @@
function runTest()
{
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
worker = new Worker('resources/interrupt-database-sync.js');
Modified: trunk/LayoutTests/fast/workers/storage/interrupt-database.html (120521 => 120522)
--- trunk/LayoutTests/fast/workers/storage/interrupt-database.html 2012-06-16 03:42:58 UTC (rev 120521)
+++ trunk/LayoutTests/fast/workers/storage/interrupt-database.html 2012-06-16 03:54:33 UTC (rev 120522)
@@ -12,8 +12,8 @@
function finishTest()
{
log("PASS: database operations interrupted.");
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
function terminateWorker()
@@ -24,9 +24,9 @@
function runTest()
{
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
worker = new Worker('resources/interrupt-database.js');
Modified: trunk/LayoutTests/fast/workers/storage/resources/database-worker.js (120521 => 120522)
--- trunk/LayoutTests/fast/workers/storage/resources/database-worker.js 2012-06-16 03:42:58 UTC (rev 120521)
+++ trunk/LayoutTests/fast/workers/storage/resources/database-worker.js 2012-06-16 03:54:33 UTC (rev 120522)
@@ -1,9 +1,9 @@
var window = {
- layoutTestController: {
+ testRunner: {
notifyDone: function() { postMessage("notifyDone"); }
}
};
-var layoutTestController = window.layoutTestController;
+var testRunner = window.testRunner;
function log(s) {
postMessage("log:" + s);
@@ -22,7 +22,7 @@
log("Received unexpected message: " + event.data);
} catch (ex) {
log("Worker caught exception: " + ex);
- window.layoutTestController.notifyDone();
+ window.testRunner.notifyDone();
}
};
Modified: trunk/LayoutTests/fast/workers/storage/resources/multiple-transactions-sync.js (120521 => 120522)
--- trunk/LayoutTests/fast/workers/storage/resources/multiple-transactions-sync.js 2012-06-16 03:42:58 UTC (rev 120521)
+++ trunk/LayoutTests/fast/workers/storage/resources/multiple-transactions-sync.js 2012-06-16 03:54:33 UTC (rev 120522)
@@ -2,8 +2,8 @@
function checkCompletion()
{
- if (++complete == 2 && window.layoutTestController)
- layoutTestController.notifyDone();
+ if (++complete == 2 && window.testRunner)
+ testRunner.notifyDone();
}
function runTest()
Modified: trunk/LayoutTests/fast/workers/storage/resources/test-inputs-common.js (120521 => 120522)
--- trunk/LayoutTests/fast/workers/storage/resources/test-inputs-common.js 2012-06-16 03:42:58 UTC (rev 120521)
+++ trunk/LayoutTests/fast/workers/storage/resources/test-inputs-common.js 2012-06-16 03:54:33 UTC (rev 120522)
@@ -5,8 +5,8 @@
function finishTest()
{
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
function runTest(workerJSFile)
@@ -15,9 +15,9 @@
log("FAIL: no JS file specified for the worker.");
}
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
var worker = new Worker(workerJSFile);
Modified: trunk/LayoutTests/fast/workers/storage/use-same-database-in-page-and-workers.html (120521 => 120522)
--- trunk/LayoutTests/fast/workers/storage/use-same-database-in-page-and-workers.html 2012-06-16 03:42:58 UTC (rev 120521)
+++ trunk/LayoutTests/fast/workers/storage/use-same-database-in-page-and-workers.html 2012-06-16 03:54:33 UTC (rev 120522)
@@ -3,8 +3,8 @@
<script>
function finishTest()
{
- if (window.layoutTestController)
- layoutTestController.notifyDone();
+ if (window.testRunner)
+ testRunner.notifyDone();
}
function log(message)
@@ -14,9 +14,9 @@
function runTest()
{
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
}
var db = openDatabase("UseSameDatabaseInPageAndWorkers", "", "", 1);
