Title: [121950] trunk/LayoutTests
- Revision
- 121950
- Author
- toyos...@chromium.org
- Date
- 2012-07-06 03:04:56 -0700 (Fri, 06 Jul 2012)
Log Message
[Inspector][WebSocket][NRWT] layout tests which requires websocket server must be in a websocket subdirectory.
https://bugs.webkit.org/show_bug.cgi?id=90524
Reviewed by Pavel Feldman.
* http/tests/inspector/websocket/web-socket-frame-expected.txt: Renamed from LayoutTests/http/tests/inspector/web-socket-frame-expected.txt.
* http/tests/inspector/websocket/web-socket-frame.html: Renamed from LayoutTests/http/tests/inspector/web-socket-frame.html.
Modified Paths
Added Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (121949 => 121950)
--- trunk/LayoutTests/ChangeLog 2012-07-06 09:46:35 UTC (rev 121949)
+++ trunk/LayoutTests/ChangeLog 2012-07-06 10:04:56 UTC (rev 121950)
@@ -1,3 +1,13 @@
+2012-07-06 Takashi Toyoshima <toyos...@chromium.org>
+
+ [Inspector][WebSocket][NRWT] layout tests which requires websocket server must be in a websocket subdirectory.
+ https://bugs.webkit.org/show_bug.cgi?id=90524
+
+ Reviewed by Pavel Feldman.
+
+ * http/tests/inspector/websocket/web-socket-frame-expected.txt: Renamed from LayoutTests/http/tests/inspector/web-socket-frame-expected.txt.
+ * http/tests/inspector/websocket/web-socket-frame.html: Renamed from LayoutTests/http/tests/inspector/web-socket-frame.html.
+
2012-07-05 Vsevolod Vlasov <vse...@chromium.org>
Web Inspector: Workspace should dispatch WorkspaceReset event on navigation.
Deleted: trunk/LayoutTests/http/tests/inspector/web-socket-frame-expected.txt (121949 => 121950)
--- trunk/LayoutTests/http/tests/inspector/web-socket-frame-expected.txt 2012-07-06 09:46:35 UTC (rev 121949)
+++ trunk/LayoutTests/http/tests/inspector/web-socket-frame-expected.txt 2012-07-06 10:04:56 UTC (rev 121950)
@@ -1,14 +0,0 @@
-Connected.
-Tests that WebSocketFrames are being sent and recieved by Web Inspector.
-
-1- sent: test
-1- sent: test
-2- sent: exit
-1- sent: test
-2- sent: exit
-3- received: test
-1- sent: test
-2- sent: exit
-3- received: test
-4- received: exit
-
Deleted: trunk/LayoutTests/http/tests/inspector/web-socket-frame.html (121949 => 121950)
--- trunk/LayoutTests/http/tests/inspector/web-socket-frame.html 2012-07-06 09:46:35 UTC (rev 121949)
+++ trunk/LayoutTests/http/tests/inspector/web-socket-frame.html 2012-07-06 10:04:56 UTC (rev 121950)
@@ -1,41 +0,0 @@
-<html>
-<head>
-<script src=""
-<script src=""
-<script>
-if (window.testRunner)
- testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
-var ws;
-function sendMessages() {
- ws = new WebSocket("ws://localhost:8880/websocket/tests/hybi/echo");
- ws._onopen_ = function()
- {
- debug("Connected.");
- ws.send("test");
- ws.send("exit");
- };
-}
-
-function test() {
- function onRequest(event)
- {
- var request = event.data;
- if (request._type._name === "websocket") {
- for (var i = 0; i < request.frames().length; i++) {
- var frame = request.frame(i);
- var result = String.sprintf("%d-%s: %s", (i + 1), frame.sent ? " sent" : " received", frame.payloadData);
- InspectorTest.addResult(result);
- if (!frame.sent && frame.payloadData === "exit")
- InspectorTest.completeTest();
- }
- }
- }
- WebInspector.networkManager.addEventListener(WebInspector.NetworkManager.EventTypes.RequestUpdated, onRequest);
- InspectorTest.evaluateInPage("sendMessages()");
-}
-</script>
-</head>
-<body _onload_="runTest()">
-<p>Tests that WebSocketFrames are being sent and recieved by Web Inspector.</p>
-</body>
-</html>
Copied: trunk/LayoutTests/http/tests/inspector/websocket/web-socket-frame-expected.txt (from rev 121949, trunk/LayoutTests/http/tests/inspector/web-socket-frame-expected.txt) (0 => 121950)
--- trunk/LayoutTests/http/tests/inspector/websocket/web-socket-frame-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/inspector/websocket/web-socket-frame-expected.txt 2012-07-06 10:04:56 UTC (rev 121950)
@@ -0,0 +1,14 @@
+Connected.
+Tests that WebSocketFrames are being sent and recieved by Web Inspector.
+
+1- sent: test
+1- sent: test
+2- sent: exit
+1- sent: test
+2- sent: exit
+3- received: test
+1- sent: test
+2- sent: exit
+3- received: test
+4- received: exit
+
Copied: trunk/LayoutTests/http/tests/inspector/websocket/web-socket-frame.html (from rev 121949, trunk/LayoutTests/http/tests/inspector/web-socket-frame.html) (0 => 121950)
--- trunk/LayoutTests/http/tests/inspector/websocket/web-socket-frame.html (rev 0)
+++ trunk/LayoutTests/http/tests/inspector/websocket/web-socket-frame.html 2012-07-06 10:04:56 UTC (rev 121950)
@@ -0,0 +1,41 @@
+<html>
+<head>
+<script src=""
+<script src=""
+<script>
+if (window.testRunner)
+ testRunner.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
+var ws;
+function sendMessages() {
+ ws = new WebSocket("ws://localhost:8880/websocket/tests/hybi/echo");
+ ws._onopen_ = function()
+ {
+ debug("Connected.");
+ ws.send("test");
+ ws.send("exit");
+ };
+}
+
+function test() {
+ function onRequest(event)
+ {
+ var request = event.data;
+ if (request._type._name === "websocket") {
+ for (var i = 0; i < request.frames().length; i++) {
+ var frame = request.frame(i);
+ var result = String.sprintf("%d-%s: %s", (i + 1), frame.sent ? " sent" : " received", frame.payloadData);
+ InspectorTest.addResult(result);
+ if (!frame.sent && frame.payloadData === "exit")
+ InspectorTest.completeTest();
+ }
+ }
+ }
+ WebInspector.networkManager.addEventListener(WebInspector.NetworkManager.EventTypes.RequestUpdated, onRequest);
+ InspectorTest.evaluateInPage("sendMessages()");
+}
+</script>
+</head>
+<body _onload_="runTest()">
+<p>Tests that WebSocketFrames are being sent and recieved by Web Inspector.</p>
+</body>
+</html>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
