Diff
Modified: trunk/LayoutTests/ChangeLog (115152 => 115153)
--- trunk/LayoutTests/ChangeLog 2012-04-25 01:02:47 UTC (rev 115152)
+++ trunk/LayoutTests/ChangeLog 2012-04-25 01:10:09 UTC (rev 115153)
@@ -1,5 +1,37 @@
2012-04-24 Yael Aharon <[email protected]>
+ [Qt] Move notification icon download out of WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=80700
+
+ Reviewed by Jian Li.
+
+ Remove http/tests/notifications after the code the tests were testing has been removed.
+
+ * http/tests/notifications: Removed.
+ * http/tests/notifications/icon-does-not-exist-expected.txt: Removed.
+ * http/tests/notifications/icon-does-not-exist.html: Removed.
+ * http/tests/notifications/icon-exists-cancel-expected.txt: Removed.
+ * http/tests/notifications/icon-exists-cancel.html: Removed.
+ * http/tests/notifications/icon-exists-expected.txt: Removed.
+ * http/tests/notifications/icon-exists-show-alert-during-load-expected.txt: Removed.
+ * http/tests/notifications/icon-exists-show-alert-during-load.html: Removed.
+ * http/tests/notifications/icon-exists.html: Removed.
+ * http/tests/notifications/icon-requires-auth-expected.txt: Removed.
+ * http/tests/notifications/icon-requires-auth.html: Removed.
+ * http/tests/notifications/resources: Removed.
+ * http/tests/notifications/resources/icon-exists.png: Removed.
+ * http/tests/notifications/resources/icon-requires-auth.php: Removed.
+ * platform/chromium/test_expectations.txt:
+ * platform/efl/Skipped:
+ * platform/gtk/test_expectations.txt:
+ * platform/mac/Skipped:
+ * platform/qt-5.0-wk2/Skipped:
+ * platform/qt/Skipped:
+ * platform/win/Skipped:
+ * platform/wincairo/Skipped:
+
+2012-04-24 Yael Aharon <[email protected]>
+
Unreviewed rebaseline after r115134.
* platform/qt/fast/block/positioning/016-expected.txt:
Deleted: trunk/LayoutTests/http/tests/notifications/icon-does-not-exist-expected.txt (115152 => 115153)
--- trunk/LayoutTests/http/tests/notifications/icon-does-not-exist-expected.txt 2012-04-25 01:02:47 UTC (rev 115152)
+++ trunk/LayoutTests/http/tests/notifications/icon-does-not-exist-expected.txt 2012-04-25 01:10:09 UTC (rev 115153)
@@ -1,5 +0,0 @@
-DESKTOP NOTIFICATION: icon http://127.0.0.1:8000/notifications/resources/icon-does-not-exist.php, title New E-mail, text Meet me tonight at 8!
-Sending notifications with missing icon. The load would fail, but the notification should be displayed.
-
-PASS: display event invoked.
-
Deleted: trunk/LayoutTests/http/tests/notifications/icon-does-not-exist.html (115152 => 115153)
--- trunk/LayoutTests/http/tests/notifications/icon-does-not-exist.html 2012-04-25 01:02:47 UTC (rev 115152)
+++ trunk/LayoutTests/http/tests/notifications/icon-does-not-exist.html 2012-04-25 01:10:09 UTC (rev 115153)
@@ -1,37 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <script type="text/_javascript_">
- function log(message)
- {
- document.getElementById("result").innerHTML += message + "<br>";
- }
-
- function runTests()
- {
- if (window.layoutTestController) {
- layoutTestController.grantDesktopNotificationPermission("http://127.0.0.1");
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
- }
-
- if (!window.webkitNotifications) {
- log("FAIL: No webkitNotifications interface!");
- }
-
- var N = window.webkitNotifications.createNotification("resources/icon-does-not-exist.php", "New E-mail", "Meet me tonight at 8!");
-
- N._ondisplay_ = function() { log("PASS: display event invoked."); layoutTestController.notifyDone();}
- N.show();
- }
- </script>
-</head>
-<body>
-<p>Sending notifications with missing icon. The load would fail, but the notification should be displayed.</p>
-<div id="result"></div>
-
-<script type="text/_javascript_">
-runTests();
-</script>
-</body>
-</html>
Deleted: trunk/LayoutTests/http/tests/notifications/icon-exists-cancel-expected.txt (115152 => 115153)
--- trunk/LayoutTests/http/tests/notifications/icon-exists-cancel-expected.txt 2012-04-25 01:02:47 UTC (rev 115152)
+++ trunk/LayoutTests/http/tests/notifications/icon-exists-cancel-expected.txt 2012-04-25 01:10:09 UTC (rev 115153)
@@ -1,5 +0,0 @@
-DESKTOP NOTIFICATION: icon http://127.0.0.1:8000/notifications/resources/icon-exists.png, title Second E-mail, text Actually, meet me tonight at 9!
-Sending notification, cancelling it while the icon is loading and sending a second notification. Only the second notification should be displayed
-
-PASS: display event invoked.
-
Deleted: trunk/LayoutTests/http/tests/notifications/icon-exists-cancel.html (115152 => 115153)
--- trunk/LayoutTests/http/tests/notifications/icon-exists-cancel.html 2012-04-25 01:02:47 UTC (rev 115152)
+++ trunk/LayoutTests/http/tests/notifications/icon-exists-cancel.html 2012-04-25 01:10:09 UTC (rev 115153)
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <script type="text/_javascript_">
- function log(message)
- {
- document.getElementById("result").innerHTML += message + "<br>";
- }
-
- function runTests()
- {
- if (window.layoutTestController) {
- layoutTestController.grantDesktopNotificationPermission("http://127.0.0.1");
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
- }
-
- if (!window.webkitNotifications) {
- log("FAIL: No webkitNotifications interface!");
- }
- var N = window.webkitNotifications.createNotification("resources/icon-exists.png", "New E-mail", "Meet me tonight at 8!");
- N._ondisplay_ = function() { log("FAIL: display event invoked."); layoutTestController.notifyDone(); }
- N._onclose_ = function() { log("FAIL: close event invoked."); layoutTestController.notifyDone(); }
- N.show();
- N.cancel();
- var other = window.webkitNotifications.createNotification("resources/icon-exists.png", "Second E-mail", "Actually, meet me tonight at 9!");
- other._ondisplay_ = function() { log("PASS: display event invoked."); layoutTestController.notifyDone(); }
- other.show();
- }
- </script>
-</head>
-<body>
-<p>Sending notification, cancelling it while the icon is loading and sending a second notification. Only the second notification should be displayed</p>
-<div id="result"></div>
-
-<script type="text/_javascript_">
-runTests();
-</script>
-</body>
-</html>
Deleted: trunk/LayoutTests/http/tests/notifications/icon-exists-expected.txt (115152 => 115153)
--- trunk/LayoutTests/http/tests/notifications/icon-exists-expected.txt 2012-04-25 01:02:47 UTC (rev 115152)
+++ trunk/LayoutTests/http/tests/notifications/icon-exists-expected.txt 2012-04-25 01:10:09 UTC (rev 115153)
@@ -1,5 +0,0 @@
-DESKTOP NOTIFICATION: icon http://127.0.0.1:8000/notifications/resources/icon-exists.png, title New E-mail, text Meet me tonight at 8!
-Sending notifications with an icon. The icon should be loaded.
-
-PASS: display event invoked.
-
Deleted: trunk/LayoutTests/http/tests/notifications/icon-exists-show-alert-during-load-expected.txt (115152 => 115153)
--- trunk/LayoutTests/http/tests/notifications/icon-exists-show-alert-during-load-expected.txt 2012-04-25 01:02:47 UTC (rev 115152)
+++ trunk/LayoutTests/http/tests/notifications/icon-exists-show-alert-during-load-expected.txt 2012-04-25 01:10:09 UTC (rev 115153)
@@ -1,6 +0,0 @@
-ALERT: Load should be deferred due to alert
-DESKTOP NOTIFICATION: icon http://127.0.0.1:8000/notifications/resources/icon-exists.png, title New E-mail, text Meet me tonight at 8!
-Sending notification, and then alert. Load should be deferred but continue after the alert.
-
-PASS: display event invoked.
-
Deleted: trunk/LayoutTests/http/tests/notifications/icon-exists-show-alert-during-load.html (115152 => 115153)
--- trunk/LayoutTests/http/tests/notifications/icon-exists-show-alert-during-load.html 2012-04-25 01:02:47 UTC (rev 115152)
+++ trunk/LayoutTests/http/tests/notifications/icon-exists-show-alert-during-load.html 2012-04-25 01:10:09 UTC (rev 115153)
@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <script type="text/_javascript_">
- function log(message)
- {
- document.getElementById("result").innerHTML += message + "<br>";
- }
-
- function runTests()
- {
- if (window.layoutTestController) {
- layoutTestController.grantDesktopNotificationPermission("http://127.0.0.1");
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
- }
-
- if (!window.webkitNotifications) {
- log("FAIL: No webkitNotifications interface!");
- }
- var N = window.webkitNotifications.createNotification("resources/icon-exists.png", "New E-mail", "Meet me tonight at 8!");
- N._ondisplay_ = function() { log("PASS: display event invoked."); layoutTestController.notifyDone(); }
- N.show();
- alert("Load should be deferred due to alert");
- }
- </script>
-</head>
-<body>
-<p>Sending notification, and then alert. Load should be deferred but continue after the alert.</p>
-<div id="result"></div>
-
-<script type="text/_javascript_">
-runTests();
-</script>
-</body>
-</html>
Deleted: trunk/LayoutTests/http/tests/notifications/icon-exists.html (115152 => 115153)
--- trunk/LayoutTests/http/tests/notifications/icon-exists.html 2012-04-25 01:02:47 UTC (rev 115152)
+++ trunk/LayoutTests/http/tests/notifications/icon-exists.html 2012-04-25 01:10:09 UTC (rev 115153)
@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <script type="text/_javascript_">
- function log(message)
- {
- document.getElementById("result").innerHTML += message + "<br>";
- }
-
- function runTests()
- {
- if (window.layoutTestController) {
- layoutTestController.grantDesktopNotificationPermission("http://127.0.0.1");
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
- }
-
- if (!window.webkitNotifications) {
- log("FAIL: No webkitNotifications interface!");
- }
-
- var N = window.webkitNotifications.createNotification("resources/icon-exists.png", "New E-mail", "Meet me tonight at 8!");
- N._ondisplay_ = function() { log("PASS: display event invoked."); layoutTestController.notifyDone();}
- N.show();
- }
- </script>
-</head>
-<body>
-<p>Sending notifications with an icon. The icon should be loaded.</p>
-<div id="result"></div>
-
-<script type="text/_javascript_">
-runTests();
-</script>
-</body>
-</html>
Deleted: trunk/LayoutTests/http/tests/notifications/icon-requires-auth-expected.txt (115152 => 115153)
--- trunk/LayoutTests/http/tests/notifications/icon-requires-auth-expected.txt 2012-04-25 01:02:47 UTC (rev 115152)
+++ trunk/LayoutTests/http/tests/notifications/icon-requires-auth-expected.txt 2012-04-25 01:10:09 UTC (rev 115153)
@@ -1,5 +0,0 @@
-DESKTOP NOTIFICATION: icon http://127.0.0.1:8000/notifications/resources/icon-requires-auth.php, title New E-mail, text Meet me tonight at 8!
-Sending notification that requires authentication. The load would fail, but the notification would be displayed.
-
-PASS: display event invoked.
-
Deleted: trunk/LayoutTests/http/tests/notifications/icon-requires-auth.html (115152 => 115153)
--- trunk/LayoutTests/http/tests/notifications/icon-requires-auth.html 2012-04-25 01:02:47 UTC (rev 115152)
+++ trunk/LayoutTests/http/tests/notifications/icon-requires-auth.html 2012-04-25 01:10:09 UTC (rev 115153)
@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <script type="text/_javascript_">
- function log(message)
- {
- document.getElementById("result").innerHTML += message + "<br>";
- }
-
- function runTests()
- {
- if (window.layoutTestController) {
- layoutTestController.grantDesktopNotificationPermission("http://127.0.0.1");
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
- }
-
- if (!window.webkitNotifications) {
- log("FAIL: No webkitNotifications interface!");
- }
-
- var N = window.webkitNotifications.createNotification("resources/icon-requires-auth.php", "New E-mail", "Meet me tonight at 8!");
- N._ondisplay_ = function() { log("PASS: display event invoked."); layoutTestController.notifyDone();}
- N.show();
- }
- </script>
-</head>
-<body>
-<p>Sending notification that requires authentication. The load would fail, but the notification would be displayed.</p>
-<div id="result"></div>
-
-<script type="text/_javascript_">
-runTests();
-</script>
-</body>
-</html>
Deleted: trunk/LayoutTests/http/tests/notifications/resources/icon-exists.png
(Binary files differ)
Deleted: trunk/LayoutTests/http/tests/notifications/resources/icon-requires-auth.php (115152 => 115153)
--- trunk/LayoutTests/http/tests/notifications/resources/icon-requires-auth.php 2012-04-25 01:02:47 UTC (rev 115152)
+++ trunk/LayoutTests/http/tests/notifications/resources/icon-requires-auth.php 2012-04-25 01:10:09 UTC (rev 115153)
@@ -1,6 +0,0 @@
-<?php
- header('WWW-Authenticate: Basic realm="WebKit Test Realm"');
- header('HTTP/1.0 401 Unauthorized');
- echo 'Authentication canceled';
- exit;
-?>
Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (115152 => 115153)
--- trunk/LayoutTests/platform/chromium/test_expectations.txt 2012-04-25 01:02:47 UTC (rev 115152)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2012-04-25 01:10:09 UTC (rev 115153)
@@ -752,9 +752,6 @@
WONTFIX SKIP : media/video-element-other-namespace-crash.html = TIMEOUT
WONTFIX SKIP : media/video-size-intrinsic-scale.html = TIMEOUT FAIL
-// Chromium does not use the icon loader in WebCore for loading notifications.
-WONTFIX SKIP : http/tests/notifications = FAIL
-
// Doesn't apply to Chromium (QuickTime-specific behavior)
WONTFIX SKIP : media/video-does-not-loop.html = TIMEOUT
Modified: trunk/LayoutTests/platform/efl/Skipped (115152 => 115153)
--- trunk/LayoutTests/platform/efl/Skipped 2012-04-25 01:02:47 UTC (rev 115152)
+++ trunk/LayoutTests/platform/efl/Skipped 2012-04-25 01:10:09 UTC (rev 115153)
@@ -763,7 +763,6 @@
# The EFL port has no support for desktop notifications
fast/notifications
-http/tests/notifications
# The EFL port has no support for WebP decoding
fast/images/webp-image-decoding.html
Modified: trunk/LayoutTests/platform/gtk/test_expectations.txt (115152 => 115153)
--- trunk/LayoutTests/platform/gtk/test_expectations.txt 2012-04-25 01:02:47 UTC (rev 115152)
+++ trunk/LayoutTests/platform/gtk/test_expectations.txt 2012-04-25 01:10:09 UTC (rev 115153)
@@ -95,7 +95,6 @@
// Desktop notifications are not supported.
BUGWKGTK SKIP : fast/notifications = FAIL
-BUGWKGTK SKIP : http/tests/notifications = FAIL
// We lack userscripts support.
BUGWKGTK SKIP : userscripts = FAIL
Modified: trunk/LayoutTests/platform/mac/Skipped (115152 => 115153)
--- trunk/LayoutTests/platform/mac/Skipped 2012-04-25 01:02:47 UTC (rev 115152)
+++ trunk/LayoutTests/platform/mac/Skipped 2012-04-25 01:10:09 UTC (rev 115153)
@@ -43,7 +43,6 @@
# This port doesn't support Notifications.
fast/notifications
-http/tests/notifications
# Skipped while Eric Carlson works on a fix.
# https://bugs.webkit.org/show_bug.cgi?id=28221
Modified: trunk/LayoutTests/platform/qt/Skipped (115152 => 115153)
--- trunk/LayoutTests/platform/qt/Skipped 2012-04-25 01:02:47 UTC (rev 115152)
+++ trunk/LayoutTests/platform/qt/Skipped 2012-04-25 01:10:09 UTC (rev 115153)
@@ -641,11 +641,6 @@
# JSC does not support setIsolatedWorldSecurityOrigin (http://webkit.org/b/61540)
http/tests/security/isolatedWorld/cross-origin-xhr.html
-# [Qt] http/tests/notifications tests make fast/notifications/notifications-click-event.html fail
-# https://bugs.webkit.org/show_bug.cgi?id=71693
-http/tests/notifications/icon-does-not-exist.html
-http/tests/notifications/icon-exists-show-alert-during-load.html
-
# [Qt] new test http/tests/misc/xslt-bad-import.html is failing
# https://bugs.webkit.org/show_bug.cgi?id=72252
http/tests/misc/xslt-bad-import.html
@@ -654,9 +649,6 @@
# https://bugs.webkit.org/show_bug.cgi?id=84016
http/tests/xmlhttprequest/xmlhttprequest-check-head-readystate-for-404.html
-# REGRESSION (r115011) - https://bugs.webkit.org/show_bug.cgi?id=80700
-http/tests/notifications/icon-exists-cancel.html
-
# =========================================================================== #
# Failing xmlhttprequest tests #
# =========================================================================== #
Modified: trunk/LayoutTests/platform/qt-5.0-wk2/Skipped (115152 => 115153)
--- trunk/LayoutTests/platform/qt-5.0-wk2/Skipped 2012-04-25 01:02:47 UTC (rev 115152)
+++ trunk/LayoutTests/platform/qt-5.0-wk2/Skipped 2012-04-25 01:10:09 UTC (rev 115153)
@@ -180,9 +180,6 @@
# layoutTestController.ignoreDesktopNotificationPermissionRequests is unimplemented
fast/notifications
-# layoutTestController.grantDesktopNotificationPermission is unimplemented
-http/tests/notifications
-
# layoutTestController.setScrollbarPolicy is unimplemented
fast/overflow/scrollbar-restored-and-then-locked.html
Modified: trunk/LayoutTests/platform/win/Skipped (115152 => 115153)
--- trunk/LayoutTests/platform/win/Skipped 2012-04-25 01:02:47 UTC (rev 115152)
+++ trunk/LayoutTests/platform/win/Skipped 2012-04-25 01:10:09 UTC (rev 115153)
@@ -827,7 +827,6 @@
# This port doesn't support Notifications.
fast/notifications
-http/tests/notifications
# These media tests regressed on the bots. Skipping to make the bots green again.
# https://bugs.webkit.org/show_bug.cgi?id=28281
Modified: trunk/LayoutTests/platform/wincairo/Skipped (115152 => 115153)
--- trunk/LayoutTests/platform/wincairo/Skipped 2012-04-25 01:02:47 UTC (rev 115152)
+++ trunk/LayoutTests/platform/wincairo/Skipped 2012-04-25 01:10:09 UTC (rev 115153)
@@ -1352,7 +1352,6 @@
# This port doesn't support Notifications.
fast/notifications
-http/tests/notifications
# These media tests regressed on the bots. Skipping to make the bots green again.
# https://bugs.webkit.org/show_bug.cgi?id=28281
