Title: [128079] trunk/LayoutTests
- Revision
- 128079
- Author
- [email protected]
- Date
- 2012-09-10 11:06:39 -0700 (Mon, 10 Sep 2012)
Log Message
[Tests] Move fast/notifications/notifications-double-show.html to http/tests/notifications
https://bugs.webkit.org/show_bug.cgi?id=95537
<rdar://problem/12213860>
Reviewed by Alexey Proskuryakov.
Calling show() multiple times should only call the ondisplay event handler once.
* fast/notifications/notifications-double-show-expected.txt: Removed.
* fast/notifications/notifications-double-show.html: Removed.
* http/tests/notifications/legacy/double-show-expected.txt: Added.
* http/tests/notifications/legacy/double-show.html: Added.
Modified Paths
Added Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (128078 => 128079)
--- trunk/LayoutTests/ChangeLog 2012-09-10 17:42:39 UTC (rev 128078)
+++ trunk/LayoutTests/ChangeLog 2012-09-10 18:06:39 UTC (rev 128079)
@@ -1,3 +1,18 @@
+2012-08-31 Jon Lee <[email protected]>
+
+ [Tests] Move fast/notifications/notifications-double-show.html to http/tests/notifications
+ https://bugs.webkit.org/show_bug.cgi?id=95537
+ <rdar://problem/12213860>
+
+ Reviewed by Alexey Proskuryakov.
+
+ Calling show() multiple times should only call the ondisplay event handler once.
+
+ * fast/notifications/notifications-double-show-expected.txt: Removed.
+ * fast/notifications/notifications-double-show.html: Removed.
+ * http/tests/notifications/legacy/double-show-expected.txt: Added.
+ * http/tests/notifications/legacy/double-show.html: Added.
+
2012-09-04 Robert Hogan <[email protected]>
CSS 2.1 failure: content-counter-010.htm fails
Deleted: trunk/LayoutTests/fast/notifications/notifications-double-show-expected.txt (128078 => 128079)
--- trunk/LayoutTests/fast/notifications/notifications-double-show-expected.txt 2012-09-10 17:42:39 UTC (rev 128078)
+++ trunk/LayoutTests/fast/notifications/notifications-double-show-expected.txt 2012-09-10 18:06:39 UTC (rev 128079)
@@ -1,4 +0,0 @@
-DESKTOP NOTIFICATION: icon http://0.0.0.0/my_icon.png, title New E-mail, text Meet me tonight at 8!
-Sending notifications...
-
-
Deleted: trunk/LayoutTests/fast/notifications/notifications-double-show.html (128078 => 128079)
--- trunk/LayoutTests/fast/notifications/notifications-double-show.html 2012-09-10 17:42:39 UTC (rev 128078)
+++ trunk/LayoutTests/fast/notifications/notifications-double-show.html 2012-09-10 18:06:39 UTC (rev 128079)
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <script type="text/_javascript_">
- function log(message)
- {
- document.getElementById("result").innerHTML += message + "<br>";
- }
-
- function runTests()
- {
- if (window.testRunner) {
- testRunner.grantWebNotificationPermission("file://");
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
- }
-
- if (!window.webkitNotifications) {
- log("FAIL: No webkitNotifications interface!");
- }
-
- var N = window.webkitNotifications.createNotification("http://0.0.0.0/my_icon.png", "New E-mail", "Meet me tonight at 8!");
- N._ondisplay_ = function() { testRunner.notifyDone(); }
- N.show();
- N.show();
- }
- </script>
-</head>
-<body>
-<p>Sending notifications...</p>
-<div id="result"></div>
-
-<script type="text/_javascript_">
-runTests();
-</script>
-
-</body>
-</html>
Added: trunk/LayoutTests/http/tests/notifications/legacy/double-show-expected.txt (0 => 128079)
--- trunk/LayoutTests/http/tests/notifications/legacy/double-show-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/notifications/legacy/double-show-expected.txt 2012-09-10 18:06:39 UTC (rev 128079)
@@ -0,0 +1,11 @@
+Sending double-show notification...
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS window.webkitNotifications is defined.
+PASS ondisplay event handler called
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/http/tests/notifications/legacy/double-show.html (0 => 128079)
--- trunk/LayoutTests/http/tests/notifications/legacy/double-show.html (rev 0)
+++ trunk/LayoutTests/http/tests/notifications/legacy/double-show.html 2012-09-10 18:06:39 UTC (rev 128079)
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<script src=""
+<script src=""
+<p id="description"></p>
+<div id="console"></div>
+
+<script type="text/_javascript_">
+description("Sending double-show notification...");
+
+if (window.testRunner) {
+ testRunner.grantWebNotificationPermission(testURL);
+ testRunner.waitUntilDone();
+}
+
+shouldBeDefined("window.webkitNotifications");
+
+var N = window.webkitNotifications.createNotification("http://0.0.0.0/my_icon.png", "New E-mail", "Meet me tonight at 8!");
+N._ondisplay_ = function() {
+ testPassed("ondisplay event handler called");
+ testCompleted();
+};
+N.show();
+N.show();
+setTimeout(testCompleted, 100);
+</script>
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
