[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75
eric at webkit.org
eric at webkit.org
Thu Oct 29 20:36:47 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit e750151069e0c501ebd6f955af79e2ad887fcf64
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Sep 30 12:02:00 2009 +0000
2009-09-30 Shinichiro Hamaji <hamaji at chromium.org>
Reviewed by David Levin.
Move message-port-multi.js from resources to script-tests
https://bugs.webkit.org/show_bug.cgi?id=29798
Revert r48823. message-port-multi.js needs custom HTML.
* fast/events/message-port-multi-expected.txt:
* fast/events/message-port-multi.html:
* fast/events/resources/message-port-multi.js: Added.
(channel.port2.onmessage):
* fast/events/script-tests/message-port-multi.js: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48926 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index b862705..9ea0198 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,20 @@
2009-09-30 Shinichiro Hamaji <hamaji at chromium.org>
+ Reviewed by David Levin.
+
+ Move message-port-multi.js from resources to script-tests
+ https://bugs.webkit.org/show_bug.cgi?id=29798
+
+ Revert r48823. message-port-multi.js needs custom HTML.
+
+ * fast/events/message-port-multi-expected.txt:
+ * fast/events/message-port-multi.html:
+ * fast/events/resources/message-port-multi.js: Added.
+ (channel.port2.onmessage):
+ * fast/events/script-tests/message-port-multi.js: Removed.
+
+2009-09-30 Shinichiro Hamaji <hamaji at chromium.org>
+
Reviewed by David Kilzer.
Change remaining references in tests from bugzilla.opendarwin.org to bugs.webkit.org
diff --git a/LayoutTests/fast/events/message-port-multi-expected.txt b/LayoutTests/fast/events/message-port-multi-expected.txt
index 1538c0f..8328d10 100644
--- a/LayoutTests/fast/events/message-port-multi-expected.txt
+++ b/LayoutTests/fast/events/message-port-multi-expected.txt
@@ -9,9 +9,6 @@ PASS channel.port1.postMessage("null port", [channel3.port1, null, channel3.port
PASS channel.port1.postMessage("notAPort", [channel3.port1, {}, channel3.port2]) threw exception TypeError: Type error.
PASS channel.port1.postMessage("notAnArray", channel3.port1) threw exception TypeError: Type error.
PASS channel.port1.postMessage("notASequence", [{length: 3}]) threw exception TypeError: Type error.
-PASS successfullyParsed is true
-
-TEST COMPLETE
PASS event.ports is null when no port sent
PASS event.ports is null when empty array sent
PASS event.ports contains two ports when two ports sent
diff --git a/LayoutTests/fast/events/message-port-multi.html b/LayoutTests/fast/events/message-port-multi.html
index e2b064c..6aa0fb6 100644
--- a/LayoutTests/fast/events/message-port-multi.html
+++ b/LayoutTests/fast/events/message-port-multi.html
@@ -1,5 +1,3 @@
-<!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>
@@ -7,7 +5,6 @@
<body>
<p id="description"></p>
<div id="console"></div>
-<script src="script-tests/message-port-multi.js"></script>
-<script src="../js/resources/js-test-post.js"></script>
+<script src="resources/message-port-multi.js"></script>
+<!-- We don't use the standard js-test-post as this is an asynchronous test -->
</body>
-</html>
diff --git a/LayoutTests/fast/events/resources/message-port-multi.js b/LayoutTests/fast/events/resources/message-port-multi.js
new file mode 100644
index 0000000..f7e3436
--- /dev/null
+++ b/LayoutTests/fast/events/resources/message-port-multi.js
@@ -0,0 +1,62 @@
+if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+ layoutTestController.waitUntilDone();
+}
+
+description("This test checks the various use cases around sending multiple ports through MessagePort.postMessage");
+
+var channel = new MessageChannel();
+var channel2 = new MessageChannel();
+var channel3 = new MessageChannel();
+
+channel.port1.postMessage("noport");
+channel.port1.postMessage("zero ports", []);
+channel.port1.postMessage("two ports", [channel2.port1, channel2.port2]);
+
+// Now test various failure cases
+shouldThrow('channel.port1.postMessage("same port", [channel.port1])');
+shouldThrow('channel.port1.postMessage("entangled port", [channel.port2])');
+shouldThrow('channel.port1.postMessage("null port", [channel3.port1, null, channel3.port2])');
+shouldThrow('channel.port1.postMessage("notAPort", [channel3.port1, {}, channel3.port2])');
+// Should be OK to send channel3.port1 (should not have been disentangled by the previous failed calls).
+channel.port1.postMessage("entangled ports", [channel3.port1, channel3.port2]);
+
+shouldThrow('channel.port1.postMessage("notAnArray", channel3.port1)')
+shouldThrow('channel.port1.postMessage("notASequence", [{length: 3}])');
+
+channel.port1.postMessage("done");
+
+channel.port2.onmessage = function(event) {
+ if (event.data == "noport") {
+ if (!event.ports)
+ testPassed("event.ports is null when no port sent");
+ else
+ testFailed("event.ports should be null when no port sent");
+ } else if (event.data == "zero ports") {
+ if (!event.ports)
+ testPassed("event.ports is null when empty array sent");
+ else
+ testFailed("event.ports should be null when empty array sent");
+ } else if (event.data == "two ports") {
+ if (!event.ports) {
+ testFailed("event.ports should be non-null when ports sent");
+ return;
+ }
+ if (event.ports.length == 2)
+ testPassed("event.ports contains two ports when two ports sent");
+ else
+ testFailed("event.ports contained " + event.ports.length + " when two ports sent");
+
+ } else if (event.data == "entangled ports") {
+ if (event.ports.length == 2)
+ testPassed("event.ports contains two ports when two ports re-sent after error");
+ else
+ testFailed("event.ports contained " + event.ports.length + " when two ports re-sent after error");
+ } else if (event.data == "done") {
+ debug('<br><span class="pass">TEST COMPLETE</span>');
+ if (window.layoutTestController)
+ layoutTestController.notifyDone();
+ } else
+ testFailed("Received unexpected message: " + event.data);
+}
+
diff --git a/LayoutTests/fast/events/script-tests/message-port-multi.js b/LayoutTests/fast/events/script-tests/message-port-multi.js
deleted file mode 100644
index ffb3543..0000000
--- a/LayoutTests/fast/events/script-tests/message-port-multi.js
+++ /dev/null
@@ -1,63 +0,0 @@
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
-}
-
-description("This test checks the various use cases around sending multiple ports through MessagePort.postMessage");
-
-var channel = new MessageChannel();
-var channel2 = new MessageChannel();
-var channel3 = new MessageChannel();
-
-channel.port1.postMessage("noport");
-channel.port1.postMessage("zero ports", []);
-channel.port1.postMessage("two ports", [channel2.port1, channel2.port2]);
-
-// Now test various failure cases
-shouldThrow('channel.port1.postMessage("same port", [channel.port1])');
-shouldThrow('channel.port1.postMessage("entangled port", [channel.port2])');
-shouldThrow('channel.port1.postMessage("null port", [channel3.port1, null, channel3.port2])');
-shouldThrow('channel.port1.postMessage("notAPort", [channel3.port1, {}, channel3.port2])');
-// Should be OK to send channel3.port1 (should not have been disentangled by the previous failed calls).
-channel.port1.postMessage("entangled ports", [channel3.port1, channel3.port2]);
-
-shouldThrow('channel.port1.postMessage("notAnArray", channel3.port1)')
-shouldThrow('channel.port1.postMessage("notASequence", [{length: 3}])');
-
-channel.port1.postMessage("done");
-
-channel.port2.onmessage = function(event) {
- if (event.data == "noport") {
- if (!event.ports)
- testPassed("event.ports is null when no port sent");
- else
- testFailed("event.ports should be null when no port sent");
- } else if (event.data == "zero ports") {
- if (!event.ports)
- testPassed("event.ports is null when empty array sent");
- else
- testFailed("event.ports should be null when empty array sent");
- } else if (event.data == "two ports") {
- if (!event.ports) {
- testFailed("event.ports should be non-null when ports sent");
- return;
- }
- if (event.ports.length == 2)
- testPassed("event.ports contains two ports when two ports sent");
- else
- testFailed("event.ports contained " + event.ports.length + " when two ports sent");
-
- } else if (event.data == "entangled ports") {
- if (event.ports.length == 2)
- testPassed("event.ports contains two ports when two ports re-sent after error");
- else
- testFailed("event.ports contained " + event.ports.length + " when two ports re-sent after error");
- } else if (event.data == "done") {
- debug('<br><span class="pass">TEST COMPLETE</span>');
- if (window.layoutTestController)
- layoutTestController.notifyDone();
- } else
- testFailed("Received unexpected message: " + event.data);
-}
-
-var successfullyParsed = true;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list