Bug 1416151 - Moving websocket code and tests in dom/websocket, r=qdot

mozilla-spidermonkey · Nov 10, 2017 · 0eff564 · 0eff564
1 parent d0307c6
commit 0eff564
Show file tree

Hide file tree

Showing 67 changed files with 182 additions and 175 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -245,6 +245,7 @@ dom/vr/**
 dom/webauthn/**
 dom/webbrowserpersist/**
 dom/webidl/**
+dom/websocket/**
 dom/workers/**
 dom/worklet/**
 dom/xbl/**

diff --git a/dom/base/moz.build b/dom/base/moz.build
@@ -216,7 +216,6 @@ EXPORTS.mozilla.dom += [
     'TimeoutManager.h',
     'TreeWalker.h',
     'WebKitCSSMatrix.h',
-    'WebSocket.h',
     'WindowOrientationObserver.h',
 ]
 
@@ -364,7 +363,6 @@ UNIFIED_SOURCES += [
     'TimeoutManager.cpp',
     'TreeWalker.cpp',
     'WebKitCSSMatrix.cpp',
-    'WebSocket.cpp',
     'WindowNamedPropertiesHandler.cpp',
     'WindowOrientationObserver.cpp',
     'XPathGenerator.cpp',

diff --git a/dom/base/test/chrome.ini b/dom/base/test/chrome.ini
@@ -34,4 +34,3 @@ support-files = file_navigator_resolve_identity_xrays.xul
 [test_sandboxed_blob_uri.html]
 [test_sendQueryContentAndSelectionSetEvent.html]
 [test_urgent_start.html]
-[test_websocket_frame.html]
diff --git a/dom/base/test/mochitest.ini b/dom/base/test/mochitest.ini
@@ -65,7 +65,6 @@ support-files =
   file_bug1091883_frame.html
   file_bug1091883_subframe.html
   file_bug1091883_target.html
-  file_bug1384658.html
   file_bug28293.sjs
   file_bug326337.xml
   file_bug326337_inner.html
@@ -156,15 +155,6 @@ support-files =
   file_timer_flood.html
   file_viewport_scroll_quirks.html
   file_viewport_scroll_xml.xml
-  file_websocket_basic_wsh.py
-  file_websocket_bigBlob_wsh.py
-  file_websocket_hello_wsh.py
-  file_websocket_http_resource.txt
-  file_websocket_permessage_deflate_wsh.py
-  file_websocket_permessage_deflate_disabled_wsh.py
-  file_websocket_permessage_deflate_rejected_wsh.py
-  file_websocket_permessage_deflate_params_wsh.py
-  file_websocket_wsh.py
   file_x-frame-options_main.html
   file_x-frame-options_page.sjs
   file_xhtmlserializer_1.xhtml
@@ -224,8 +214,6 @@ support-files =
   file_bug1250148.sjs
   file_bug1268962.sjs
   mozbrowser_api_utils.js
-  websocket_helpers.js
-  websocket_tests.js
   !/dom/security/test/cors/file_CrossSiteXHR_server.sjs
   !/image/test/mochitest/blue.png
   script_bug1238440.js
@@ -250,8 +238,6 @@ support-files =
   file4_setting_opener.html
   PASS.html
   FAIL.html
-  window_bug1384658.html
-  frame_bug1384658.html
 
 [test_anchor_area_referrer.html]
 [test_anchor_area_referrer_changing.html]
@@ -599,8 +585,6 @@ skip-if = stylo # bug 1293844
 [test_bug1064481.html]
 [test_bug1070015.html]
 [test_bug1075702.html]
-[test_bug1081686.html]
-skip-if = toolkit == 'android'
 [test_bug1091883.html]
 [test_bug1101364.html]
 skip-if = toolkit == 'android'
@@ -625,8 +609,6 @@ skip-if = toolkit == 'android'
 [test_bug1318303.html]
 [test_bug1375050.html]
 [test_bug1381710.html]
-[test_bug1384658.html]
-skip-if = toolkit == 'android'
 [test_bug1384661.html]
 [test_bug1399603.html]
 [test_bug1399605.html]
@@ -805,27 +787,6 @@ skip-if = toolkit == 'android'
 tags = audiochannel
 [test_webaudioNotificationStopOnNavigation.html]
 tags = audiochannel
-[test_websocket_basic.html]
-skip-if = toolkit == 'android'
-[test_websocket_hello.html]
-skip-if = toolkit == 'android'
-[test_websocket_permessage_deflate.html]
-skip-if = toolkit == 'android'
-[test_webSocket_sandbox.html]
-skip-if = toolkit == 'android'
-support-files = iframe_webSocket_sandbox.html
-[test_websocket1.html]
-skip-if = toolkit == 'android'
-[test_websocket2.html]
-skip-if = toolkit == 'android'
-[test_websocket3.html]
-skip-if = toolkit == 'android'
-[test_websocket4.html]
-skip-if = toolkit == 'android'
-[test_websocket5.html]
-skip-if = toolkit == 'android'
-[test_websocket_bigBlob.html]
-skip-if = toolkit == 'android'
 [test_window_constructor.html]
 [test_window_content.html]
 [test_window_cross_origin_props.html]

diff --git a/dom/base/test/moz.build b/dom/base/test/moz.build
@@ -11,7 +11,6 @@ XPCSHELL_TESTS_MANIFESTS += [
 
 MOCHITEST_MANIFESTS += [
     'mochitest.ini',
-    'websocket_hybi/mochitest.ini',
 ]
 
 MOCHITEST_CHROME_MANIFESTS += [

diff --git a/dom/moz.build b/dom/moz.build
@@ -108,6 +108,7 @@ DIRS += [
     'worklet',
     'script',
     'payments',
+    'websocket',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':

diff --git a/dom/base/WebSocket.cpp → dom/websocket/WebSocket.cpp b/dom/base/WebSocket.cpp → dom/websocket/WebSocket.cpp
diff --git a/dom/base/WebSocket.h → dom/websocket/WebSocket.h b/dom/base/WebSocket.h → dom/websocket/WebSocket.h
diff --git a/dom/websocket/moz.build b/dom/websocket/moz.build
@@ -0,0 +1,34 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+with Files("**"):
+    BUG_COMPONENT = ("Core", "DOM")
+
+EXPORTS.mozilla.dom += [
+    'WebSocket.h',
+]
+
+UNIFIED_SOURCES += [
+    'WebSocket.cpp',
+]
+
+LOCAL_INCLUDES += [
+    '/dom/base',
+    '/dom/workers',
+]
+
+MOCHITEST_CHROME_MANIFESTS += [
+    'tests/chrome.ini',
+]
+
+MOCHITEST_MANIFESTS += [
+    'tests/mochitest.ini',
+    'tests/websocket_hybi/mochitest.ini',
+]
+
+include('/ipc/chromium/chromium-config.mozbuild')
+
+FINAL_LIBRARY = 'xul'
diff --git a/dom/websocket/tests/chrome.ini b/dom/websocket/tests/chrome.ini
@@ -0,0 +1,4 @@
+[DEFAULT]
+skip-if = os == 'android'
+
+[test_websocket_frame.html]
diff --git a/dom/base/test/file_bug1384658.html → dom/websocket/tests/file_bug1384658.html b/dom/base/test/file_bug1384658.html → dom/websocket/tests/file_bug1384658.html
@@ -8,7 +8,7 @@
       bc.close();
     }
     try {
-      new WebSocket("ws://mochi.test:8888/tests/dom/base/test/file_websocket_basic");
+      new WebSocket("ws://mochi.test:8888/tests/dom/websocket/tests/file_websocket_basic");
       done(true); // no hang!
     } catch (e) {
       done(false);

diff --git a/dom/base/test/file_websocket_basic_wsh.py → ...bsocket/tests/file_websocket_basic_wsh.py b/dom/base/test/file_websocket_basic_wsh.py → ...bsocket/tests/file_websocket_basic_wsh.py
diff --git a/dom/base/test/file_websocket_bigBlob_wsh.py → ...ocket/tests/file_websocket_bigBlob_wsh.py b/dom/base/test/file_websocket_bigBlob_wsh.py → ...ocket/tests/file_websocket_bigBlob_wsh.py
diff --git a/dom/base/test/file_websocket_hello_wsh.py → ...bsocket/tests/file_websocket_hello_wsh.py b/dom/base/test/file_websocket_hello_wsh.py → ...bsocket/tests/file_websocket_hello_wsh.py
diff --git a/...ase/test/file_websocket_http_resource.txt → ...et/tests/file_websocket_http_resource.txt b/...ase/test/file_websocket_http_resource.txt → ...et/tests/file_websocket_http_resource.txt
diff --git a/...socket_permessage_deflate_disabled_wsh.py → ...socket_permessage_deflate_disabled_wsh.py b/...socket_permessage_deflate_disabled_wsh.py → ...socket_permessage_deflate_disabled_wsh.py
diff --git a/...ebsocket_permessage_deflate_params_wsh.py → ...ebsocket_permessage_deflate_params_wsh.py b/...ebsocket_permessage_deflate_params_wsh.py → ...ebsocket_permessage_deflate_params_wsh.py
diff --git a/...socket_permessage_deflate_rejected_wsh.py → ...socket_permessage_deflate_rejected_wsh.py b/...socket_permessage_deflate_rejected_wsh.py → ...socket_permessage_deflate_rejected_wsh.py
diff --git a/.../file_websocket_permessage_deflate_wsh.py → .../file_websocket_permessage_deflate_wsh.py b/.../file_websocket_permessage_deflate_wsh.py → .../file_websocket_permessage_deflate_wsh.py
diff --git a/dom/base/test/file_websocket_wsh.py → dom/websocket/tests/file_websocket_wsh.py b/dom/base/test/file_websocket_wsh.py → dom/websocket/tests/file_websocket_wsh.py
diff --git a/dom/base/test/frame_bug1384658.html → dom/websocket/tests/frame_bug1384658.html b/dom/base/test/frame_bug1384658.html → dom/websocket/tests/frame_bug1384658.html
diff --git a/dom/base/test/iframe_webSocket_sandbox.html → ...ocket/tests/iframe_webSocket_sandbox.html b/dom/base/test/iframe_webSocket_sandbox.html → ...ocket/tests/iframe_webSocket_sandbox.html
@@ -23,7 +23,7 @@
   "</scr" + "ipt></html>";
 } else if (location.search == '?opener') {
   try{
-    var socket = new WebSocket('ws://mochi.test:8888/tests/dom/base/test/file_websocket_basic');
+    var socket = new WebSocket('ws://mochi.test:8888/tests/dom/websocket/tests/file_websocket_basic');
     socket.onerror = function(e) {
       opener.postMessage('WS onerror', '*');
       close();
@@ -44,7 +44,7 @@
   ifr.srcdoc = `
   <html><script>
   try{
-    var socket = new WebSocket('ws://mochi.test:8888/tests/dom/base/test/file_websocket_basic');
+    var socket = new WebSocket('ws://mochi.test:8888/tests/dom/websocket/tests/file_websocket_basic');
     socket.onerror = function(e) {
       parent.postMessage('WS onerror', '*');
     };

diff --git a/dom/websocket/tests/mochitest.ini b/dom/websocket/tests/mochitest.ini
@@ -0,0 +1,48 @@
+[DEFAULT]
+skip-if = toolkit == 'android' # bug 982828
+support-files =
+  file_websocket_basic_wsh.py
+  file_websocket_hello_wsh.py
+  file_websocket_http_resource.txt
+  file_websocket_permessage_deflate_wsh.py
+  file_websocket_permessage_deflate_disabled_wsh.py
+  file_websocket_permessage_deflate_rejected_wsh.py
+  file_websocket_permessage_deflate_params_wsh.py
+  file_websocket_wsh.py
+  websocket_helpers.js
+  websocket_tests.js
+  websocket_worker_helpers.js
+
+[test_bug1081686.html]
+[test_bug1384658.html]
+support-files = window_bug1384658.html frame_bug1384658.html file_bug1384658.html
+[test_websocket1.html]
+[test_websocket2.html]
+[test_websocket3.html]
+[test_websocket4.html]
+[test_websocket5.html]
+[test_websocket_basic.html]
+[test_websocket_hello.html]
+[test_websocket_permessage_deflate.html]
+[test_webSocket_sandbox.html]
+support-files = iframe_webSocket_sandbox.html
+[test_worker_websocket1.html]
+support-files = websocket_worker1.js
+[test_worker_websocket2.html]
+support-files = websocket_worker2.js
+[test_worker_websocket3.html]
+support-files = websocket_worker3.js
+[test_worker_websocket4.html]
+support-files = websocket_worker4.js
+[test_worker_websocket5.html]
+support-files = websocket_worker5.js
+[test_worker_websocket_basic.html]
+support-files = websocket_basic_worker.js
+[test_worker_websocket_https.html]
+support-files = websocket_worker_https.html websocket_https_worker.js
+[test_worker_websocket_loadgroup.html]
+support-files = websocket_loadgroup_worker.js
+[test_webSocket_sharedWorker.html]
+support-files = webSocket_sharedWorker.js
+[test_websocket_bigBlob.html]
+support-files = file_websocket_bigBlob_wsh.py
diff --git a/dom/base/test/test_bug1081686.html → dom/websocket/tests/test_bug1081686.html b/dom/base/test/test_bug1081686.html → dom/websocket/tests/test_bug1081686.html
@@ -27,7 +27,7 @@
 }
 
 function testWebSocket () {
-  ws = new WebSocket("ws://mochi.test:8888/tests/dom/base/test/file_websocket_hello");
+  ws = new WebSocket("ws://mochi.test:8888/tests/dom/websocket/tests/file_websocket_hello");
   ws.onopen = function(e) {
     ws.send("data");
   }
@@ -39,7 +39,7 @@
       is(ws.binaryType, 'blob', 'WebSocket.binaryType is blob');
       ws.binaryType = 'arraybuffer';
       is(ws.binaryType, 'arraybuffer', 'WebSocket.binaryType is arraybuffer');
-      is(ws.url, 'ws://mochi.test:8888/tests/dom/base/test/file_websocket_hello', 'WebSocket.url is correct');
+      is(ws.url, 'ws://mochi.test:8888/tests/dom/websocket/tests/file_websocket_hello', 'WebSocket.url is correct');
       ws.close();
       ws.send('foobar');
       SimpleTest.finish();

diff --git a/dom/base/test/test_bug1384658.html → dom/websocket/tests/test_bug1384658.html b/dom/base/test/test_bug1384658.html → dom/websocket/tests/test_bug1384658.html
@@ -23,7 +23,7 @@
 }
 
 function test_window() {
-  var win = window.open("http://example.com/tests/dom/base/test/window_bug1384658.html",
+  var win = window.open("http://example.com/tests/dom/websocket/tests/window_bug1384658.html",
                         "_blank", "width=100,height=100");
   var bc = new BroadcastChannel("test_channel");
   bc.onmessage = ev => {

diff --git a/dom/base/test/test_webSocket_sandbox.html → ...bsocket/tests/test_webSocket_sandbox.html b/dom/base/test/test_webSocket_sandbox.html → ...bsocket/tests/test_webSocket_sandbox.html
@@ -9,9 +9,9 @@
 <div id="container"></div>
 <iframe id="frame"></iframe>
 <script type="application/javascript;version=1.8">
-var urls = [ "https://example.com/tests/dom/base/test/iframe_webSocket_sandbox.html",
-             "https://example.com/tests/dom/base/test/iframe_webSocket_sandbox.html?nested",
-             "https://example.com/tests/dom/base/test/iframe_webSocket_sandbox.html?popup" ];
+var urls = [ "https://example.com/tests/dom/websocket/tests/iframe_webSocket_sandbox.html",
+             "https://example.com/tests/dom/websocket/tests/iframe_webSocket_sandbox.html?nested",
+             "https://example.com/tests/dom/websocket/tests/iframe_webSocket_sandbox.html?popup" ];
 
 onmessage = function(e) {
   is(e.data, "WS Throws!", "ws://URI cannot be used by a https iframe");

diff --git a/...ers/test/test_webSocket_sharedWorker.html → ...et/tests/test_webSocket_sharedWorker.html b/...ers/test/test_webSocket_sharedWorker.html → ...et/tests/test_webSocket_sharedWorker.html
diff --git a/dom/base/test/test_websocket1.html → dom/websocket/tests/test_websocket1.html b/dom/base/test/test_websocket1.html → dom/websocket/tests/test_websocket1.html
diff --git a/dom/base/test/test_websocket2.html → dom/websocket/tests/test_websocket2.html b/dom/base/test/test_websocket2.html → dom/websocket/tests/test_websocket2.html
diff --git a/dom/base/test/test_websocket3.html → dom/websocket/tests/test_websocket3.html b/dom/base/test/test_websocket3.html → dom/websocket/tests/test_websocket3.html
diff --git a/dom/base/test/test_websocket4.html → dom/websocket/tests/test_websocket4.html b/dom/base/test/test_websocket4.html → dom/websocket/tests/test_websocket4.html
diff --git a/dom/base/test/test_websocket5.html → dom/websocket/tests/test_websocket5.html b/dom/base/test/test_websocket5.html → dom/websocket/tests/test_websocket5.html
diff --git a/dom/base/test/test_websocket_basic.html → ...websocket/tests/test_websocket_basic.html b/dom/base/test/test_websocket_basic.html → ...websocket/tests/test_websocket_basic.html
@@ -14,7 +14,7 @@
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
-const kUrl = "ws://mochi.test:8888/tests/dom/base/test/file_websocket_basic";
+const kUrl = "ws://mochi.test:8888/tests/dom/websocket/tests/file_websocket_basic";
 
 var gTestElement;
 var ws;
@@ -37,7 +37,7 @@
   gTestElement.textContent = "Running testWebSocket1()";
 
   var results = ["test",
-                 "/tests/dom/base/test/file_websocket_basic",
+                 "/tests/dom/websocket/tests/file_websocket_basic",
                  "http://mochi.test:8888",
                  "end"];
 

diff --git a/dom/base/test/test_websocket_bigBlob.html → ...bsocket/tests/test_websocket_bigBlob.html b/dom/base/test/test_websocket_bigBlob.html → ...bsocket/tests/test_websocket_bigBlob.html
@@ -10,7 +10,7 @@
 <body>
 <script class="testbody" type="text/javascript">
 
-var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket_bigBlob");
+var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/websocket/tests/file_websocket_bigBlob");
 is(ws.readyState, 0, "Initial readyState is 0");
 ws.binaryType = "blob";
 

diff --git a/dom/base/test/test_websocket_frame.html → ...websocket/tests/test_websocket_frame.html b/dom/base/test/test_websocket_frame.html → ...websocket/tests/test_websocket_frame.html
@@ -12,7 +12,7 @@
 
 const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
 
-const URI = "ws://mochi.test:8888/tests/dom/base/test/file_websocket_basic";
+const URI = "ws://mochi.test:8888/tests/dom/websocket/tests/file_websocket_basic";
 
 var frameReceivedCounter = 0;
 var frameSentCounter = 0;

diff --git a/dom/base/test/test_websocket_hello.html → ...websocket/tests/test_websocket_hello.html b/dom/base/test/test_websocket_hello.html → ...websocket/tests/test_websocket_hello.html
@@ -18,7 +18,7 @@
 var ws;
 
 function testWebSocket () {
-  ws = new WebSocket("ws://mochi.test:8888/tests/dom/base/test/file_websocket_hello");
+  ws = new WebSocket("ws://mochi.test:8888/tests/dom/websocket/tests/file_websocket_hello");
   ws.onopen = function(e) {
     ws.send("data");
   }

diff --git a/...st/test_websocket_permessage_deflate.html → ...ts/test_websocket_permessage_deflate.html b/...st/test_websocket_permessage_deflate.html → ...ts/test_websocket_permessage_deflate.html
@@ -21,13 +21,13 @@
 
 tests = [
   // enable PMCE
-  [ true, true, "ws://mochi.test:8888/tests/dom/base/test/file_websocket_permessage_deflate" ],
+  [ true, true, "ws://mochi.test:8888/tests/dom/websocket/tests/file_websocket_permessage_deflate" ],
   // disable PMCE
-  [ false, false, "ws://mochi.test:8888/tests/dom/base/test/file_websocket_permessage_deflate_disabled" ],
+  [ false, false, "ws://mochi.test:8888/tests/dom/websocket/tests/file_websocket_permessage_deflate_disabled" ],
   // server rejects offered PMCE
-  [ true, false, "ws://mochi.test:8888/tests/dom/base/test/file_websocket_permessage_deflate_rejected" ],
+  [ true, false, "ws://mochi.test:8888/tests/dom/websocket/tests/file_websocket_permessage_deflate_rejected" ],
   // server returns parameters in the handshake
-  [ true, true, "ws://mochi.test:8888/tests/dom/base/test/file_websocket_permessage_deflate_params" ]
+  [ true, true, "ws://mochi.test:8888/tests/dom/websocket/tests/file_websocket_permessage_deflate_params" ]
 ]
 
 function ab2str(buf) {

diff --git a/dom/workers/test/test_websocket1.html → ...bsocket/tests/test_worker_websocket1.html b/dom/workers/test/test_websocket1.html → ...bsocket/tests/test_worker_websocket1.html
diff --git a/dom/workers/test/test_websocket2.html → ...bsocket/tests/test_worker_websocket2.html b/dom/workers/test/test_websocket2.html → ...bsocket/tests/test_worker_websocket2.html
diff --git a/dom/workers/test/test_websocket3.html → ...bsocket/tests/test_worker_websocket3.html b/dom/workers/test/test_websocket3.html → ...bsocket/tests/test_worker_websocket3.html
diff --git a/dom/workers/test/test_websocket4.html → ...bsocket/tests/test_worker_websocket4.html b/dom/workers/test/test_websocket4.html → ...bsocket/tests/test_worker_websocket4.html
diff --git a/dom/workers/test/test_websocket5.html → ...bsocket/tests/test_worker_websocket5.html b/dom/workers/test/test_websocket5.html → ...bsocket/tests/test_worker_websocket5.html
diff --git a/dom/workers/test/test_websocket_basic.html → ...et/tests/test_worker_websocket_basic.html b/dom/workers/test/test_websocket_basic.html → ...et/tests/test_worker_websocket_basic.html
diff --git a/dom/workers/test/test_websocket_https.html → ...et/tests/test_worker_websocket_https.html b/dom/workers/test/test_websocket_https.html → ...et/tests/test_worker_websocket_https.html
@@ -25,6 +25,6 @@
 
 </script>
 </pre>
-<iframe src="https://example.com/tests/dom/workers/test/websocket_https.html"></iframe>
+<iframe src="https://example.com/tests/dom/websocket/tests/websocket_worker_https.html"></iframe>
 </body>
 </html>
diff --git a/...orkers/test/test_websocket_loadgroup.html → ...ests/test_worker_websocket_loadgroup.html b/...orkers/test/test_websocket_loadgroup.html → ...ests/test_worker_websocket_loadgroup.html
diff --git a/dom/workers/test/webSocket_sharedWorker.js → ...websocket/tests/webSocket_sharedWorker.js b/dom/workers/test/webSocket_sharedWorker.js → ...websocket/tests/webSocket_sharedWorker.js
@@ -1,5 +1,5 @@
 onconnect = function(evt) {
-  var ws = new WebSocket("ws://mochi.test:8888/tests/dom/base/test/file_websocket_hello");
+  var ws = new WebSocket("ws://mochi.test:8888/tests/dom/websocket/tests/file_websocket_hello");
 
   ws.onopen = function(e) {
     evt.ports[0].postMessage({type: 'status', status: true, msg: 'OnOpen called' });

diff --git a/dom/workers/test/websocket_basic_worker.js → ...websocket/tests/websocket_basic_worker.js b/dom/workers/test/websocket_basic_worker.js → ...websocket/tests/websocket_basic_worker.js
@@ -19,7 +19,7 @@ onmessage = function(event) {
 
   postMessage({type: 'status', status: status, msg: 'WebSocket object:' + WebSocket});
 
-  var ws = new WebSocket("ws://mochi.test:8888/tests/dom/base/test/file_websocket_hello");
+  var ws = new WebSocket("ws://mochi.test:8888/tests/dom/websocket/tests/file_websocket_hello");
   ws.onopen = function(e) {
     postMessage({type: 'status', status: true, msg: 'OnOpen called' });
     ws.send("data");

diff --git a/dom/base/test/websocket_helpers.js → dom/websocket/tests/websocket_helpers.js b/dom/base/test/websocket_helpers.js → dom/websocket/tests/websocket_helpers.js
diff --git a/dom/workers/test/websocket_https_worker.js → ...websocket/tests/websocket_https_worker.js b/dom/workers/test/websocket_https_worker.js → ...websocket/tests/websocket_https_worker.js
@@ -1,7 +1,7 @@
 onmessage = function() {
   var wsCreated = true;
   try {
-    new WebSocket("ws://mochi.test:8888/tests/dom/base/test/file_websocket_hello");
+    new WebSocket("ws://mochi.test:8888/tests/dom/websocket/tests/file_websocket_hello");
   } catch(e) {
     wsCreated = false;
   }

diff --git a/.../websocket_hybi/file_binary-frames_wsh.py → .../websocket_hybi/file_binary-frames_wsh.py b/.../websocket_hybi/file_binary-frames_wsh.py → .../websocket_hybi/file_binary-frames_wsh.py
diff --git a/...et_hybi/file_check-binary-messages_wsh.py → ...et_hybi/file_check-binary-messages_wsh.py b/...et_hybi/file_check-binary-messages_wsh.py → ...et_hybi/file_check-binary-messages_wsh.py
diff --git a/dom/base/test/websocket_hybi/mochitest.ini → ...socket/tests/websocket_hybi/mochitest.ini b/dom/base/test/websocket_hybi/mochitest.ini → ...socket/tests/websocket_hybi/mochitest.ini
diff --git a/...socket_hybi/test_receive-arraybuffer.html → ...socket_hybi/test_receive-arraybuffer.html b/...socket_hybi/test_receive-arraybuffer.html → ...socket_hybi/test_receive-arraybuffer.html
@@ -39,7 +39,7 @@
     return array.buffer;
 }
 
-var ws = new WebSocket("ws://mochi.test:8888/tests/dom/base/test/websocket_hybi/file_binary-frames");
+var ws = new WebSocket("ws://mochi.test:8888/tests/dom/websocket/tests/websocket_hybi/file_binary-frames");
 ws.binaryType = "arraybuffer";
 is(ws.binaryType, "arraybuffer", "should be equal to 'arraybuffer'");