summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorjianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-26 00:37:12 +0000
committerjianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-26 00:37:12 +0000
commite1645210943f1e0597bd9adaf868e6fde80db605 (patch)
tree31ec31df7770d991b21311b0edbaa0da5f1d1e4d /webkit
parent3b33faae96e4cf42ec6b0da5163668b1e482d821 (diff)
downloadchromium_src-e1645210943f1e0597bd9adaf868e6fde80db605.zip
chromium_src-e1645210943f1e0597bd9adaf868e6fde80db605.tar.gz
chromium_src-e1645210943f1e0597bd9adaf868e6fde80db605.tar.bz2
Rebase LayoutTests/http/tests/workers/worker-importScripts.html.
This is needed to address the different v8 error message being thrown. BUG=none TEST=none Review URL: http://codereview.chromium.org/147127 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19321 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/workers/worker-importScripts-expected.txt44
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/workers/worker-importScripts-expected.txt44
2 files changed, 88 insertions, 0 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/workers/worker-importScripts-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/workers/worker-importScripts-expected.txt
new file mode 100644
index 0000000..d1b7004
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/workers/worker-importScripts-expected.txt
@@ -0,0 +1,44 @@
+Test importScripts.
+
+Test started.
+PASS: importScripts(), exists, is a function, and doesn't throw when not given any arguments
+Loaded message from different origin
+PASS: executed script from different origin
+Loaded message from different origin
+PASS: executed script from different origin through a redirect
+Testing single argument:
+Loaded resource 1
+PASS: loaded first source
+Testing multiple arguments:
+Loaded resource 1
+Loaded resource 2
+PASS: Both sources loaded and executed.
+Testing multiple arguments (different order):
+Resource 2 loaded before resource 1
+Loaded resource 2
+Loaded resource 1
+PASS: Both sources loaded and executed.
+Testing multiple arguments, with different origin for one argument:
+Loaded resource 1
+Loaded message from different origin
+Loaded resource 2
+PASS: all resources executed.
+Loaded resource 1
+PASS: Threw Error: NETWORK_ERR: XMLHttpRequest Exception 101 when load failed
+PASS: some resources were loaded despite the network error
+Loaded resource 1
+PASS: Threw SyntaxError: Unexpected identifier when encountering a syntax error in imported script
+PASS: some resources were loaded despite the presence of a syntax error
+Testing multiple arguments, with first resource throwing an exception:
+Loaded resource 1
+First resource throwing an exception
+PASS: Propagated 'Thrown by first resource' from script
+PASS: First resource was executed, and second resource was not
+Testing multiple arguments, with second resource throwing an exception:
+Loaded resource 1
+Loaded resource 2
+Second resource throwing an exception
+PASS: Propagated 'Thrown by second resource' from script
+PASS: Both scripts were executed
+DONE
+
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/workers/worker-importScripts-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/workers/worker-importScripts-expected.txt
new file mode 100644
index 0000000..d1b7004
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/workers/worker-importScripts-expected.txt
@@ -0,0 +1,44 @@
+Test importScripts.
+
+Test started.
+PASS: importScripts(), exists, is a function, and doesn't throw when not given any arguments
+Loaded message from different origin
+PASS: executed script from different origin
+Loaded message from different origin
+PASS: executed script from different origin through a redirect
+Testing single argument:
+Loaded resource 1
+PASS: loaded first source
+Testing multiple arguments:
+Loaded resource 1
+Loaded resource 2
+PASS: Both sources loaded and executed.
+Testing multiple arguments (different order):
+Resource 2 loaded before resource 1
+Loaded resource 2
+Loaded resource 1
+PASS: Both sources loaded and executed.
+Testing multiple arguments, with different origin for one argument:
+Loaded resource 1
+Loaded message from different origin
+Loaded resource 2
+PASS: all resources executed.
+Loaded resource 1
+PASS: Threw Error: NETWORK_ERR: XMLHttpRequest Exception 101 when load failed
+PASS: some resources were loaded despite the network error
+Loaded resource 1
+PASS: Threw SyntaxError: Unexpected identifier when encountering a syntax error in imported script
+PASS: some resources were loaded despite the presence of a syntax error
+Testing multiple arguments, with first resource throwing an exception:
+Loaded resource 1
+First resource throwing an exception
+PASS: Propagated 'Thrown by first resource' from script
+PASS: First resource was executed, and second resource was not
+Testing multiple arguments, with second resource throwing an exception:
+Loaded resource 1
+Loaded resource 2
+Second resource throwing an exception
+PASS: Propagated 'Thrown by second resource' from script
+PASS: Both scripts were executed
+DONE
+