[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9
ukai at chromium.org
ukai at chromium.org
Thu Feb 4 21:24:23 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 594b7471e9477d75997b8d8fdca087fd4be0eb7b
Author: ukai at chromium.org <ukai at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jan 22 06:01:45 2010 +0000
2010-01-21 Fumitoshi Ukai <ukai at chromium.org>
Reviewed by Shinichiro Hamaji.
Move fast/websockets into websocket/tests
https://bugs.webkit.org/show_bug.cgi?id=32258
* fast/websockets: Removed.
* websocket/tests/script-tests/websocket-event-target.js: Copied from LayoutTests/fast/websockets/script-tests/websocket-event-target.js.
* websocket/tests/websocket-event-target-expected.txt: Copied from LayoutTests/fast/websockets/websocket-event-target-expected.txt.
* websocket/tests/websocket-event-target.html: Copied from LayoutTests/fast/websockets/websocket-event-target.html.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53676 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index a6cfb7e..5554559 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-21 Fumitoshi Ukai <ukai at chromium.org>
+
+ Reviewed by Shinichiro Hamaji.
+
+ Move fast/websockets into websocket/tests
+ https://bugs.webkit.org/show_bug.cgi?id=32258
+
+ * fast/websockets: Removed.
+ * websocket/tests/script-tests/websocket-event-target.js: Copied from LayoutTests/fast/websockets/script-tests/websocket-event-target.js.
+ * websocket/tests/websocket-event-target-expected.txt: Copied from LayoutTests/fast/websockets/websocket-event-target-expected.txt.
+ * websocket/tests/websocket-event-target.html: Copied from LayoutTests/fast/websockets/websocket-event-target.html.
+
2010-01-21 Brady Eidson <beidson at apple.com>
Reviewed by Maciej Stachowiak.
diff --git a/LayoutTests/fast/websockets/script-tests/TEMPLATE.html b/LayoutTests/fast/websockets/script-tests/TEMPLATE.html
deleted file mode 100644
index 1936e0d..0000000
--- a/LayoutTests/fast/websockets/script-tests/TEMPLATE.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<link rel="stylesheet" href="../js/resources/js-test-style.css">
-<script src="../js/resources/js-test-pre.js"></script>
-</head>
-<body>
-<p id="description"></p>
-<div id="console"></div>
-<script src="YOUR_JS_FILE_HERE"></script>
-<script src="../js/resources/js-test-post.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/fast/websockets/script-tests/websocket-event-target.js b/LayoutTests/fast/websockets/script-tests/websocket-event-target.js
deleted file mode 100644
index b01df6d..0000000
--- a/LayoutTests/fast/websockets/script-tests/websocket-event-target.js
+++ /dev/null
@@ -1,55 +0,0 @@
-description("Make sure WebSocket object acts as EventTarget.");
-
-var ws = new WebSocket("ws://localhost:8000");
-ws.close(); // That is not a WebSocket server, prevent logging an error to console.
-var open_event_handled = false;
-var message_event_handled = false;
-var close_event_handled = false;
-function openListener() {
- open_event_handled = true;
-};
-function messageListener() {
- message_event_handled = true;
-};
-function closeListener() {
- close_event_handled = true;
-}
-ws.addEventListener('open', openListener, false);
-ws.addEventListener('message', messageListener, false);
-ws.addEventListener('close', closeListener, false);
-
-shouldBe("open_event_handled", "false");
-shouldBe("message_event_handled", "false");
-shouldBe("close_event_handled", "false");
-
-var evt = document.createEvent("Events");
-evt.initEvent("open", true, false);
-ws.dispatchEvent(evt);
-shouldBe("open_event_handled", "true");
-
-open_event_handled = false;
-ws.removeEventListener('open', openListener);
-ws.dispatchEvent(evt);
-shouldBe("open_event_handled", "false");
-
-evt = document.createEvent("MessageEvent");
-evt.initEvent("message", true, false);
-ws.dispatchEvent(evt);
-shouldBe("message_event_handled", "true");
-
-message_event_handled = false;
-ws.removeEventListener('message', messageListener);
-ws.dispatchEvent(evt);
-shouldBe("message_event_handled", "false");
-
-evt = document.createEvent("Events");
-evt.initEvent("close", true, false);
-ws.dispatchEvent(evt);
-shouldBe("close_event_handled", "true");
-
-close_event_handled = false;
-ws.removeEventListener('close', closeListener);
-ws.dispatchEvent(evt);
-shouldBe("close_event_handled", "false");
-
-var successfullyParsed = true;
diff --git a/LayoutTests/fast/websockets/websocket-event-target-expected.txt b/LayoutTests/fast/websockets/websocket-event-target-expected.txt
deleted file mode 100644
index 86f206e..0000000
--- a/LayoutTests/fast/websockets/websocket-event-target-expected.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-Make sure WebSocket object acts as EventTarget.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS open_event_handled is false
-PASS message_event_handled is false
-PASS close_event_handled is false
-PASS open_event_handled is true
-PASS open_event_handled is false
-PASS message_event_handled is true
-PASS message_event_handled is false
-PASS close_event_handled is true
-PASS close_event_handled is false
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/fast/websockets/websocket-event-target.html b/LayoutTests/fast/websockets/websocket-event-target.html
deleted file mode 100644
index 6b19ee0..0000000
--- a/LayoutTests/fast/websockets/websocket-event-target.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<link rel="stylesheet" href="../js/resources/js-test-style.css">
-<script src="../js/resources/js-test-pre.js"></script>
-</head>
-<body>
-<p id="description"></p>
-<div id="console"></div>
-<script src="script-tests/websocket-event-target.js"></script>
-<script src="../js/resources/js-test-post.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/websocket/tests/script-tests/websocket-event-target.js b/LayoutTests/websocket/tests/script-tests/websocket-event-target.js
new file mode 100644
index 0000000..1d6a9d6
--- /dev/null
+++ b/LayoutTests/websocket/tests/script-tests/websocket-event-target.js
@@ -0,0 +1,56 @@
+description("Make sure WebSocket object acts as EventTarget.");
+
+var ws = new WebSocket("ws://localhost:8000");
+ws.close(); // That is not a WebSocket server, prevent logging an error to console.
+var open_event_handled = false;
+var message_event_handled = false;
+var close_event_handled = false;
+function openListener() {
+ open_event_handled = true;
+};
+function messageListener() {
+ message_event_handled = true;
+};
+function closeListener() {
+ close_event_handled = true;
+}
+ws.addEventListener('open', openListener, false);
+ws.addEventListener('message', messageListener, false);
+ws.addEventListener('close', closeListener, false);
+
+shouldBe("open_event_handled", "false");
+shouldBe("message_event_handled", "false");
+shouldBe("close_event_handled", "false");
+
+var evt = document.createEvent("Events");
+evt.initEvent("open", true, false);
+ws.dispatchEvent(evt);
+shouldBe("open_event_handled", "true");
+
+open_event_handled = false;
+ws.removeEventListener('open', openListener);
+ws.dispatchEvent(evt);
+shouldBe("open_event_handled", "false");
+
+evt = document.createEvent("MessageEvent");
+evt.initEvent("message", true, false);
+ws.dispatchEvent(evt);
+shouldBe("message_event_handled", "true");
+
+message_event_handled = false;
+ws.removeEventListener('message', messageListener);
+ws.dispatchEvent(evt);
+shouldBe("message_event_handled", "false");
+
+evt = document.createEvent("Events");
+evt.initEvent("close", true, false);
+ws.dispatchEvent(evt);
+shouldBe("close_event_handled", "true");
+
+close_event_handled = false;
+ws.removeEventListener('close', closeListener);
+ws.dispatchEvent(evt);
+shouldBe("close_event_handled", "false");
+
+var successfullyParsed = true;
+isSuccessfullyParsed();
diff --git a/LayoutTests/websocket/tests/websocket-event-target-expected.txt b/LayoutTests/websocket/tests/websocket-event-target-expected.txt
new file mode 100644
index 0000000..95b1ddd
--- /dev/null
+++ b/LayoutTests/websocket/tests/websocket-event-target-expected.txt
@@ -0,0 +1,17 @@
+Make sure WebSocket object acts as EventTarget.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+PASS open_event_handled is false
+PASS message_event_handled is false
+PASS close_event_handled is false
+PASS open_event_handled is true
+PASS open_event_handled is false
+PASS message_event_handled is true
+PASS message_event_handled is false
+PASS close_event_handled is true
+PASS close_event_handled is false
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/websocket/tests/websocket-event-target.html b/LayoutTests/websocket/tests/websocket-event-target.html
new file mode 100644
index 0000000..b645f58
--- /dev/null
+++ b/LayoutTests/websocket/tests/websocket-event-target.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<link rel="stylesheet" href="../../fast/js/resources/js-test-style.css">
+<script src="../../fast/js/resources/js-test-pre.js"></script>
+<script src="../../fast/js/resources/js-test-post-function.js"></script>
+</head>
+<body>
+<div id="description"></div>
+<div id="console"></div>
+<script src="script-tests/websocket-event-target.js"></script>
+</body>
+</html>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list