diff options
author | Manish Goregaokar <manishsmail@gmail.com> | 2016-02-04 19:01:49 +0530 |
---|---|---|
committer | Manish Goregaokar <manishsmail@gmail.com> | 2016-02-04 19:27:06 +0530 |
commit | 396533c47971d1fad1d38a5e14800b7c107e704e (patch) | |
tree | 0e8c30bb78ece5fa8c7e25ebbce1a089c8c78559 | |
parent | 853d4c0e39fff396f19f4cfad31720ec6ad1d09f (diff) | |
download | servo-396533c47971d1fad1d38a5e14800b7c107e704e.tar.gz servo-396533c47971d1fad1d38a5e14800b7c107e704e.zip |
Use a .worker.js test
4 files changed, 24 insertions, 44 deletions
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json index cfef4a11246..fac71bb940d 100644 --- a/tests/wpt/metadata/MANIFEST.json +++ b/tests/wpt/metadata/MANIFEST.json @@ -33719,10 +33719,10 @@ "deleted": [], "items": { "testharness": { - "websockets/Send-data-worker.htm": [ + "websockets/Send-data.worker.js": [ { - "path": "websockets/Send-data-worker.htm", - "url": "/websockets/Send-data-worker.htm" + "path": "websockets/Send-data.worker.js", + "url": "/websockets/Send-data.worker" } ] } diff --git a/tests/wpt/web-platform-tests/websockets/Send-data-worker.htm b/tests/wpt/web-platform-tests/websockets/Send-data-worker.htm deleted file mode 100644 index bc946f12357..00000000000 --- a/tests/wpt/web-platform-tests/websockets/Send-data-worker.htm +++ /dev/null @@ -1,28 +0,0 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Send data - WebSocket from Worker</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - async_test(function(t) { - var worker = new Worker("Send-data-worker.js"); - - var data = "test data"; - - worker.onmessage = t.step_func_done(function(e) { - assert_equals(e.data, data); - }); - - worker.postMessage(data); - - }, "W3C WebSocket API - Send data on a WebSocket in a Worker") - - </script> -</body> -</html> diff --git a/tests/wpt/web-platform-tests/websockets/Send-data-worker.js b/tests/wpt/web-platform-tests/websockets/Send-data-worker.js deleted file mode 100644 index 1bb0174b6f6..00000000000 --- a/tests/wpt/web-platform-tests/websockets/Send-data-worker.js +++ /dev/null @@ -1,13 +0,0 @@ -onmessage = function (evt) { - importScripts('websocket.js?pipe=sub') - var wsocket = CreateWebSocket(false, false, false); - - wsocket.addEventListener('open', function (e) { - wsocket.send(evt.data) - }, true) - - wsocket.addEventListener('message', function (e) { - postMessage(e.data); - }, true); -} - diff --git a/tests/wpt/web-platform-tests/websockets/Send-data.worker.js b/tests/wpt/web-platform-tests/websockets/Send-data.worker.js new file mode 100644 index 00000000000..f03776fb323 --- /dev/null +++ b/tests/wpt/web-platform-tests/websockets/Send-data.worker.js @@ -0,0 +1,21 @@ +importScripts("/resources/testharness.js"); +importScripts('websocket.js?pipe=sub') + +var data = "test data"; + +async_test(function(t) { + + var wsocket = CreateWebSocket(false, false, false); + + wsocket.addEventListener('open', function (e) { + wsocket.send(data) + }, true) + + wsocket.addEventListener('message', t.step_func_done(function(e) { + assert_equals(e.data, data); + done(); + }), true); + +}, "W3C WebSocket API - Send data on a WebSocket in a Worker") + + |