[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:40 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit f7cd1ccd72af0db51186c1c5836ead022389f9cf
Author: ukai at chromium.org <ukai at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jan 22 11:57:14 2010 +0000
2010-01-22 Fumitoshi Ukai <ukai at chromium.org>
Reviewed by Maciej Stachowiak.
Split websocket/tests/bad-sub-protocol.html
https://bugs.webkit.org/show_bug.cgi?id=33646
* websocket/tests/bad-sub-protocol-control-chars-expected.txt: Added.
* websocket/tests/bad-sub-protocol-control-chars.html: Added.
* websocket/tests/bad-sub-protocol-empty-expected.txt: Added.
* websocket/tests/bad-sub-protocol-empty.html: Added.
* websocket/tests/bad-sub-protocol-expected.txt: Removed.
* websocket/tests/bad-sub-protocol-non-ascii-expected.txt: Added.
* websocket/tests/bad-sub-protocol-non-ascii.html: Added.
* websocket/tests/bad-sub-protocol.html: Removed.
* websocket/tests/script-tests/bad-sub-protocol-control-chars.js: Added.
* websocket/tests/script-tests/bad-sub-protocol-empty.js: Added.
* websocket/tests/script-tests/bad-sub-protocol-non-ascii.js: Added.
* websocket/tests/script-tests/bad-sub-protocol.js: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53692 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index bf9544a..3b8f359 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,23 @@
+2010-01-22 Fumitoshi Ukai <ukai at chromium.org>
+
+ Reviewed by Maciej Stachowiak.
+
+ Split websocket/tests/bad-sub-protocol.html
+ https://bugs.webkit.org/show_bug.cgi?id=33646
+
+ * websocket/tests/bad-sub-protocol-control-chars-expected.txt: Added.
+ * websocket/tests/bad-sub-protocol-control-chars.html: Added.
+ * websocket/tests/bad-sub-protocol-empty-expected.txt: Added.
+ * websocket/tests/bad-sub-protocol-empty.html: Added.
+ * websocket/tests/bad-sub-protocol-expected.txt: Removed.
+ * websocket/tests/bad-sub-protocol-non-ascii-expected.txt: Added.
+ * websocket/tests/bad-sub-protocol-non-ascii.html: Added.
+ * websocket/tests/bad-sub-protocol.html: Removed.
+ * websocket/tests/script-tests/bad-sub-protocol-control-chars.js: Added.
+ * websocket/tests/script-tests/bad-sub-protocol-empty.js: Added.
+ * websocket/tests/script-tests/bad-sub-protocol-non-ascii.js: Added.
+ * websocket/tests/script-tests/bad-sub-protocol.js: Removed.
+
2010-01-22 Kent Tamura <tkent at chromium.org>
Reviewed by Maciej Stachowiak.
diff --git a/LayoutTests/websocket/tests/bad-sub-protocol-control-chars-expected.txt b/LayoutTests/websocket/tests/bad-sub-protocol-control-chars-expected.txt
new file mode 100644
index 0000000..444ea40
--- /dev/null
+++ b/LayoutTests/websocket/tests/bad-sub-protocol-control-chars-expected.txt
@@ -0,0 +1,18 @@
+CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\u0000'
+CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\u0009'
+CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\u001B'
+Test WebSocket bad sub-protocol names by control characters.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", " ") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "
+") threw exception SyntaxError: Parse error.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "
+") threw exception SyntaxError: Parse error.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/websocket/tests/bad-sub-protocol-control-chars.html b/LayoutTests/websocket/tests/bad-sub-protocol-control-chars.html
new file mode 100644
index 0000000..121192a
--- /dev/null
+++ b/LayoutTests/websocket/tests/bad-sub-protocol-control-chars.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/bad-sub-protocol-control-chars.js"></script>
+</body>
+</html>
diff --git a/LayoutTests/websocket/tests/bad-sub-protocol-empty-expected.txt b/LayoutTests/websocket/tests/bad-sub-protocol-empty-expected.txt
new file mode 100644
index 0000000..ca697ed
--- /dev/null
+++ b/LayoutTests/websocket/tests/bad-sub-protocol-empty-expected.txt
@@ -0,0 +1,10 @@
+CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket ''
+Test WebSocket bad sub-protocol names (empty).
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/websocket/tests/bad-sub-protocol-empty.html b/LayoutTests/websocket/tests/bad-sub-protocol-empty.html
new file mode 100644
index 0000000..5a2b521
--- /dev/null
+++ b/LayoutTests/websocket/tests/bad-sub-protocol-empty.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/bad-sub-protocol-empty.js"></script>
+</body>
+</html>
diff --git a/LayoutTests/websocket/tests/bad-sub-protocol-expected.txt b/LayoutTests/websocket/tests/bad-sub-protocol-expected.txt
deleted file mode 100644
index fd88400..0000000
--- a/LayoutTests/websocket/tests/bad-sub-protocol-expected.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket ''
-CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\u0000'
-CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\u0009'
-CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\u001B'
-CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\u007F'
-CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\u0080'
-CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\u3042'
-CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\uFFFF'
-CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket ''
-CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\uFFFE'
-CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\uD840\uDC0B'
-Test WebSocket bad sub-protocol names.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-PASS new WebSocket("ws://127.0.0.1:8880/simple", "") threw exception Error: SYNTAX_ERR: DOM Exception 12.
-PASS new WebSocket("ws://127.0.0.1:8880/simple", "") threw exception Error: SYNTAX_ERR: DOM Exception 12.
-PASS new WebSocket("ws://127.0.0.1:8880/simple", " ") threw exception Error: SYNTAX_ERR: DOM Exception 12.
-PASS new WebSocket("ws://127.0.0.1:8880/simple", "
-") threw exception SyntaxError: Parse error.
-PASS new WebSocket("ws://127.0.0.1:8880/simple", "
-") threw exception SyntaxError: Parse error.
-PASS new WebSocket("ws://127.0.0.1:8880/simple", "") threw exception Error: SYNTAX_ERR: DOM Exception 12.
-PASS new WebSocket("ws://127.0.0.1:8880/simple", "") threw exception Error: SYNTAX_ERR: DOM Exception 12.
-PASS new WebSocket("ws://127.0.0.1:8880/simple", "€") threw exception Error: SYNTAX_ERR: DOM Exception 12.
-PASS new WebSocket("ws://127.0.0.1:8880/simple", "あ") threw exception Error: SYNTAX_ERR: DOM Exception 12.
-PASS new WebSocket("ws://127.0.0.1:8880/simple", "") threw exception Error: SYNTAX_ERR: DOM Exception 12.
-PASS new WebSocket("ws://127.0.0.1:8880/simple", "") threw exception Error: SYNTAX_ERR: DOM Exception 12.
-PASS new WebSocket("ws://127.0.0.1:8880/simple", "") threw exception Error: SYNTAX_ERR: DOM Exception 12.
-PASS new WebSocket("ws://127.0.0.1:8880/simple", "𠀋") threw exception Error: SYNTAX_ERR: DOM Exception 12.
-
diff --git a/LayoutTests/websocket/tests/bad-sub-protocol-non-ascii-expected.txt b/LayoutTests/websocket/tests/bad-sub-protocol-non-ascii-expected.txt
new file mode 100644
index 0000000..bb98661
--- /dev/null
+++ b/LayoutTests/websocket/tests/bad-sub-protocol-non-ascii-expected.txt
@@ -0,0 +1,22 @@
+CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\u007F'
+CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\u0080'
+CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\u3042'
+CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\uFFFF'
+CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket ''
+CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\uFFFE'
+CONSOLE MESSAGE: line 0: Wrong protocol for WebSocket '\uD840\uDC0B'
+Test WebSocket bad sub-protocol names by non-ASCII chars.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "€") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "あ") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS new WebSocket("ws://127.0.0.1:8880/simple", "𠀋") threw exception Error: SYNTAX_ERR: DOM Exception 12.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/websocket/tests/bad-sub-protocol-non-ascii.html b/LayoutTests/websocket/tests/bad-sub-protocol-non-ascii.html
new file mode 100644
index 0000000..60e9769
--- /dev/null
+++ b/LayoutTests/websocket/tests/bad-sub-protocol-non-ascii.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/bad-sub-protocol-non-ascii.js"></script>
+</body>
+</html>
diff --git a/LayoutTests/websocket/tests/bad-sub-protocol.html b/LayoutTests/websocket/tests/bad-sub-protocol.html
deleted file mode 100644
index ef07234..0000000
--- a/LayoutTests/websocket/tests/bad-sub-protocol.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!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/bad-sub-protocol.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/websocket/tests/script-tests/bad-sub-protocol-control-chars.js b/LayoutTests/websocket/tests/script-tests/bad-sub-protocol-control-chars.js
new file mode 100644
index 0000000..c077857
--- /dev/null
+++ b/LayoutTests/websocket/tests/script-tests/bad-sub-protocol-control-chars.js
@@ -0,0 +1,11 @@
+description("Test WebSocket bad sub-protocol names by control characters.");
+
+// Fails if protocol contains an character less than U+0020.
+shouldThrow('new WebSocket("ws://127.0.0.1:8880/simple", "\u0000")');
+shouldThrow('new WebSocket("ws://127.0.0.1:8880/simple", "\u0009")');
+shouldThrow('new WebSocket("ws://127.0.0.1:8880/simple", "\u000A")');
+shouldThrow('new WebSocket("ws://127.0.0.1:8880/simple", "\u000D")');
+shouldThrow('new WebSocket("ws://127.0.0.1:8880/simple", "\u001B")');
+
+var successfullyParsed = true;
+isSuccessfullyParsed();
diff --git a/LayoutTests/websocket/tests/script-tests/bad-sub-protocol-empty.js b/LayoutTests/websocket/tests/script-tests/bad-sub-protocol-empty.js
new file mode 100644
index 0000000..08e532f
--- /dev/null
+++ b/LayoutTests/websocket/tests/script-tests/bad-sub-protocol-empty.js
@@ -0,0 +1,7 @@
+description("Test WebSocket bad sub-protocol names (empty).");
+
+// Fails if protocol is an empty string.
+shouldThrow('new WebSocket("ws://127.0.0.1:8880/simple", "")');
+
+var successfullyParsed = true;
+isSuccessfullyParsed();
diff --git a/LayoutTests/websocket/tests/script-tests/bad-sub-protocol-non-ascii.js b/LayoutTests/websocket/tests/script-tests/bad-sub-protocol-non-ascii.js
new file mode 100644
index 0000000..62a68d5
--- /dev/null
+++ b/LayoutTests/websocket/tests/script-tests/bad-sub-protocol-non-ascii.js
@@ -0,0 +1,14 @@
+description("Test WebSocket bad sub-protocol names by non-ASCII chars.");
+
+// Fails if protocol contains an character greater than U+007E.
+shouldThrow('new WebSocket("ws://127.0.0.1:8880/simple", "\u007F")');
+shouldThrow('new WebSocket("ws://127.0.0.1:8880/simple", "\u0080")');
+shouldThrow('new WebSocket("ws://127.0.0.1:8880/simple", "\u3042")');
+shouldThrow('new WebSocket("ws://127.0.0.1:8880/simple", "\uFFFF")');
+shouldThrow('new WebSocket("ws://127.0.0.1:8880/simple", "\uFEFF")');
+shouldThrow('new WebSocket("ws://127.0.0.1:8880/simple", "\uFFFE")');
+// Surrogate pairs
+shouldThrow('new WebSocket("ws://127.0.0.1:8880/simple", "\uD840\uDC0B")');
+
+var successfullyParsed = true;
+isSuccessfullyParsed();
diff --git a/LayoutTests/websocket/tests/script-tests/bad-sub-protocol.js b/LayoutTests/websocket/tests/script-tests/bad-sub-protocol.js
deleted file mode 100644
index 66f8b38..0000000
--- a/LayoutTests/websocket/tests/script-tests/bad-sub-protocol.js
+++ /dev/null
@@ -1,23 +0,0 @@
-description("Test WebSocket bad sub-protocol names.");
-
-// Fails if protocol is an empty string.
-shouldThrow('new WebSocket("ws://127.0.0.1:8880/simple", "")');
-
-// Fails if protocol contains an character less than U+0020.
-shouldThrow('new WebSocket("ws://127.0.0.1:8880/simple", "\u0000")');
-shouldThrow('new WebSocket("ws://127.0.0.1:8880/simple", "\u0009")');
-shouldThrow('new WebSocket("ws://127.0.0.1:8880/simple", "\u000A")');
-shouldThrow('new WebSocket("ws://127.0.0.1:8880/simple", "\u000D")');
-shouldThrow('new WebSocket("ws://127.0.0.1:8880/simple", "\u001B")');
-
-// Fails if protocol contains an character greater than U+007E.
-shouldThrow('new WebSocket("ws://127.0.0.1:8880/simple", "\u007F")');
-shouldThrow('new WebSocket("ws://127.0.0.1:8880/simple", "\u0080")');
-shouldThrow('new WebSocket("ws://127.0.0.1:8880/simple", "\u3042")');
-shouldThrow('new WebSocket("ws://127.0.0.1:8880/simple", "\uFFFF")');
-shouldThrow('new WebSocket("ws://127.0.0.1:8880/simple", "\uFEFF")');
-shouldThrow('new WebSocket("ws://127.0.0.1:8880/simple", "\uFFFE")');
-// Surrogate pairs
-shouldThrow('new WebSocket("ws://127.0.0.1:8880/simple", "\uD840\uDC0B")');
-
-var successfullyParsed = true;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list