From 396533c47971d1fad1d38a5e14800b7c107e704e Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Thu, 4 Feb 2016 19:01:49 +0530 Subject: [PATCH] Use a .worker.js test --- tests/wpt/metadata/MANIFEST.json | 6 ++-- .../websockets/Send-data-worker.htm | 28 ------------------- .../websockets/Send-data-worker.js | 13 --------- .../websockets/Send-data.worker.js | 21 ++++++++++++++ 4 files changed, 24 insertions(+), 44 deletions(-) delete mode 100644 tests/wpt/web-platform-tests/websockets/Send-data-worker.htm delete mode 100644 tests/wpt/web-platform-tests/websockets/Send-data-worker.js create mode 100644 tests/wpt/web-platform-tests/websockets/Send-data.worker.js 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 @@ - - - - W3C WebSocket API - Send data - WebSocket from Worker - - - - - -
- - - 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") + +