Title: [89291] trunk/LayoutTests
Revision
89291
Author
le...@chromium.org
Date
2011-06-20 14:33:52 -0700 (Mon, 20 Jun 2011)

Log Message

Expand Web Worker test coverage for onerror to have test for url/line numbers.
https://bugs.webkit.org/show_bug.cgi?id=62898

Reviewed by Dmitry Titov.

* fast/workers/resources/worker-script-error-bubbled.js:
(onerror): Added a check for the url and put the last part in the message.
* fast/workers/worker-script-error-expected.txt: Update to have the new result.
* fast/workers/worker-script-error.html: Actually print the message from the worker.

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (89290 => 89291)


--- trunk/LayoutTests/ChangeLog	2011-06-20 21:30:28 UTC (rev 89290)
+++ trunk/LayoutTests/ChangeLog	2011-06-20 21:33:52 UTC (rev 89291)
@@ -1,3 +1,15 @@
+2011-06-20  David Levin  <le...@chromium.org>
+
+        Reviewed by Dmitry Titov.
+
+        Expand Web Worker test coverage for onerror to have test for url/line numbers.
+        https://bugs.webkit.org/show_bug.cgi?id=62898
+
+        * fast/workers/resources/worker-script-error-bubbled.js:
+        (onerror): Added a check for the url and put the last part in the message.
+        * fast/workers/worker-script-error-expected.txt: Update to have the new result.
+        * fast/workers/worker-script-error.html: Actually print the message from the worker.
+
 2011-06-20  Oliver Hunt  <oli...@apple.com>
 
         Reviewed by Darin Adler.

Modified: trunk/LayoutTests/fast/workers/resources/worker-script-error-bubbled.js (89290 => 89291)


--- trunk/LayoutTests/fast/workers/resources/worker-script-error-bubbled.js	2011-06-20 21:30:28 UTC (rev 89290)
+++ trunk/LayoutTests/fast/workers/resources/worker-script-error-bubbled.js	2011-06-20 21:33:52 UTC (rev 89291)
@@ -1,6 +1,9 @@
 _onerror_ = function(message, url, lineno)
 {
-    postMessage("onerror invoked for a script that has script error '" + message + "' at line " + lineno);
+    if (url != location.href)
+        postMessage("FAIL: Bad location. Actual: " + url + " Expected: " + location.href);
+    splitUrl = url.split('/');
+    postMessage("PASS: onerror in worker context invoked for a script that has script error '" + message + "' at line " + lineno + " in " + splitUrl[splitUrl.length - 1]);
     return true;
 }
 

Modified: trunk/LayoutTests/fast/workers/worker-script-error-expected.txt (89290 => 89291)


--- trunk/LayoutTests/fast/workers/worker-script-error-expected.txt	2011-06-20 21:30:28 UTC (rev 89290)
+++ trunk/LayoutTests/fast/workers/worker-script-error-expected.txt	2011-06-20 21:33:52 UTC (rev 89291)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 7: ReferenceError: Can't find variable: foo
+CONSOLE MESSAGE: line 10: ReferenceError: Can't find variable: foo
 Test Worker script error handling functionality. Should print a series of PASS messages, followed with DONE.
 
 PASS: onerror invoked for a script that has invalid syntax.
@@ -6,8 +6,9 @@
 PASS: event listener invoked for a script that has script error 'ReferenceError: Can't find variable: foo' at line 1.
 PASS: onerror invoked for a script that has script error 'ReferenceError: Can't find variable: foo' at line 7.
 PASS: onerror invoked for a script that has script error 'ReferenceError: Can't find variable: bar' at line 3.
-PASS: onerror invoked for a script that has script error 'ReferenceError: Can't find variable: foo' at line 7.
-PASS: onerror invoked for a script that has script error 'ReferenceError: Can't find variable: foo' at line 7.
+message from worker: "PASS: onerror in worker context invoked for a script that has script error 'ReferenceError: Can't find variable: foo' at line 10 in worker-script-error-bubbled.js".
+PASS: onerror invoked for a script that has script error 'ReferenceError: Can't find variable: foo' at line 10.
+PASS: onerror invoked for a script that has script error 'ReferenceError: Can't find variable: foo' at line 10.
 PASS: message received from WorkerGlobalScope.onerror: onerror invoked for a script that has script error 'ReferenceError: Can't find variable: foo' at line 7.
 PASS: onerror invoked for an exception in setTimeout callback.
 DONE

Modified: trunk/LayoutTests/fast/workers/worker-script-error.html (89290 => 89291)


--- trunk/LayoutTests/fast/workers/worker-script-error.html	2011-06-20 21:30:28 UTC (rev 89290)
+++ trunk/LayoutTests/fast/workers/worker-script-error.html	2011-06-20 21:33:52 UTC (rev 89291)
@@ -100,6 +100,9 @@
 {
     try {
         var worker = new Worker("resources/worker-script-error-bubbled.js");
+        worker._onmessage_ = function(evt) {
+            log("message from worker: \"" + evt.data + "\".");
+        }
         worker._onerror_ = function(evt) {
             log("PASS: onerror invoked for a script that has script error '" + evt.message + "' at line " + evt.lineno + ".");
             runNextTest();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to