From 2f90e481c9e028a08d12e17ee6956899c355e854 Mon Sep 17 00:00:00 2001 From: "darin@apple.com" Date: Fri, 27 Mar 2009 23:55:17 +0000 Subject: [PATCH] 2009-03-27 Darin Adler Reviewed by Sam Weinig. Made our mailto form submission tests work more reliably by using the new layoutTestController.waitForPolicyDelegate function. * fast/encoding/mailto-always-utf-8.html: Updated test to use waitForPolicyDelegate rather than relying on the form submission happening immediately. * fast/forms/mailto/advanced-get.html: Ditto. * fast/forms/mailto/advanced-put.html: Ditto. * fast/forms/mailto/get-multiple-items-text-plain.html: Ditto. * fast/forms/mailto/get-multiple-items-x-www-form-urlencoded.html: Ditto. * fast/forms/mailto/get-multiple-items.html: Ditto. * fast/forms/mailto/get-non-ascii-always-utf-8.html: Ditto. * fast/forms/mailto/get-non-ascii-text-plain-latin-1.html: Ditto. * fast/forms/mailto/get-non-ascii-text-plain.html: Ditto. * fast/forms/mailto/get-non-ascii.html: Ditto. * fast/forms/mailto/get-overwrite-query.html: Ditto. * fast/forms/mailto/post-append-query.html: Ditto. * fast/forms/mailto/post-multiple-items-multipart-form-data.html: Ditto. * fast/forms/mailto/post-multiple-items-text-plain.html: Ditto. * fast/forms/mailto/post-multiple-items-x-www-form-urlencoded.html: Ditto. * fast/forms/mailto/post-multiple-items.html: Ditto. * fast/forms/mailto/post-text-plain-with-accept-charset.html: Ditto. * fast/forms/mailto/post-text-plain.html: Ditto. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@42057 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- LayoutTests/ChangeLog | 27 ++++++++++++++++++++++ LayoutTests/fast/encoding/mailto-always-utf-8.html | 3 +-- LayoutTests/fast/forms/mailto/advanced-get.html | 3 +-- LayoutTests/fast/forms/mailto/advanced-put.html | 3 +-- .../mailto/get-multiple-items-text-plain.html | 3 +-- .../get-multiple-items-x-www-form-urlencoded.html | 3 +-- .../fast/forms/mailto/get-multiple-items.html | 3 +-- .../forms/mailto/get-non-ascii-always-utf-8.html | 3 +-- .../mailto/get-non-ascii-text-plain-latin-1.html | 3 +-- .../forms/mailto/get-non-ascii-text-plain.html | 3 +-- LayoutTests/fast/forms/mailto/get-non-ascii.html | 3 +-- .../fast/forms/mailto/get-overwrite-query.html | 3 +-- .../fast/forms/mailto/post-append-query.html | 3 +-- .../post-multiple-items-multipart-form-data.html | 3 +-- .../mailto/post-multiple-items-text-plain.html | 3 +-- .../post-multiple-items-x-www-form-urlencoded.html | 3 +-- .../fast/forms/mailto/post-multiple-items.html | 3 +-- .../post-text-plain-with-accept-charset.html | 3 +-- LayoutTests/fast/forms/mailto/post-text-plain.html | 3 +-- 19 files changed, 45 insertions(+), 36 deletions(-) diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog index 5403c59..73923bb 100644 --- a/LayoutTests/ChangeLog +++ b/LayoutTests/ChangeLog @@ -1,3 +1,30 @@ +2009-03-27 Darin Adler + + Reviewed by Sam Weinig. + + Made our mailto form submission tests work more reliably by using the new + layoutTestController.waitForPolicyDelegate function. + + * fast/encoding/mailto-always-utf-8.html: Updated test to use waitForPolicyDelegate + rather than relying on the form submission happening immediately. + * fast/forms/mailto/advanced-get.html: Ditto. + * fast/forms/mailto/advanced-put.html: Ditto. + * fast/forms/mailto/get-multiple-items-text-plain.html: Ditto. + * fast/forms/mailto/get-multiple-items-x-www-form-urlencoded.html: Ditto. + * fast/forms/mailto/get-multiple-items.html: Ditto. + * fast/forms/mailto/get-non-ascii-always-utf-8.html: Ditto. + * fast/forms/mailto/get-non-ascii-text-plain-latin-1.html: Ditto. + * fast/forms/mailto/get-non-ascii-text-plain.html: Ditto. + * fast/forms/mailto/get-non-ascii.html: Ditto. + * fast/forms/mailto/get-overwrite-query.html: Ditto. + * fast/forms/mailto/post-append-query.html: Ditto. + * fast/forms/mailto/post-multiple-items-multipart-form-data.html: Ditto. + * fast/forms/mailto/post-multiple-items-text-plain.html: Ditto. + * fast/forms/mailto/post-multiple-items-x-www-form-urlencoded.html: Ditto. + * fast/forms/mailto/post-multiple-items.html: Ditto. + * fast/forms/mailto/post-text-plain-with-accept-charset.html: Ditto. + * fast/forms/mailto/post-text-plain.html: Ditto. + 2009-03-27 Xiaomei Ji Reviewed by Dan Bernstein. diff --git a/LayoutTests/fast/encoding/mailto-always-utf-8.html b/LayoutTests/fast/encoding/mailto-always-utf-8.html index 44c96a1..0bb6206 100644 --- a/LayoutTests/fast/encoding/mailto-always-utf-8.html +++ b/LayoutTests/fast/encoding/mailto-always-utf-8.html @@ -15,12 +15,11 @@ function test() { if (window.layoutTestController) { layoutTestController.dumpAsText(); - layoutTestController.setCustomPolicyDelegate(true); + layoutTestController.waitForPolicyDelegate(); var a = document.getElementsByTagName("a")[0]; eventSender.mouseMoveTo(a.offsetLeft + 5, a.offsetTop + 5); eventSender.mouseDown(); eventSender.mouseUp(); - layoutTestController.setCustomPolicyDelegate(false); } } diff --git a/LayoutTests/fast/forms/mailto/advanced-get.html b/LayoutTests/fast/forms/mailto/advanced-get.html index f974700..9db9040 100644 --- a/LayoutTests/fast/forms/mailto/advanced-get.html +++ b/LayoutTests/fast/forms/mailto/advanced-get.html @@ -6,9 +6,8 @@ function test() { if (window.layoutTestController) { layoutTestController.dumpAsText(); - layoutTestController.setCustomPolicyDelegate(true); + layoutTestController.waitForPolicyDelegate(); document.getElementsByTagName("form")[0].submit(); - layoutTestController.setCustomPolicyDelegate(false); } } diff --git a/LayoutTests/fast/forms/mailto/advanced-put.html b/LayoutTests/fast/forms/mailto/advanced-put.html index fe07128..d2aec50 100644 --- a/LayoutTests/fast/forms/mailto/advanced-put.html +++ b/LayoutTests/fast/forms/mailto/advanced-put.html @@ -6,9 +6,8 @@ function test() { if (window.layoutTestController) { layoutTestController.dumpAsText(); - layoutTestController.setCustomPolicyDelegate(true); + layoutTestController.waitForPolicyDelegate(); document.getElementsByTagName("form")[0].submit(); - layoutTestController.setCustomPolicyDelegate(false); } } diff --git a/LayoutTests/fast/forms/mailto/get-multiple-items-text-plain.html b/LayoutTests/fast/forms/mailto/get-multiple-items-text-plain.html index 6dd7b0d..d2604e5 100644 --- a/LayoutTests/fast/forms/mailto/get-multiple-items-text-plain.html +++ b/LayoutTests/fast/forms/mailto/get-multiple-items-text-plain.html @@ -10,9 +10,8 @@ Line 2 function test() { if (window.layoutTestController) { layoutTestController.dumpAsText(); - layoutTestController.setCustomPolicyDelegate(true); + layoutTestController.waitForPolicyDelegate(); document.getElementsByTagName("form")[0].submit(); - layoutTestController.setCustomPolicyDelegate(false); } } diff --git a/LayoutTests/fast/forms/mailto/get-multiple-items-x-www-form-urlencoded.html b/LayoutTests/fast/forms/mailto/get-multiple-items-x-www-form-urlencoded.html index 1245394..d6c5064 100644 --- a/LayoutTests/fast/forms/mailto/get-multiple-items-x-www-form-urlencoded.html +++ b/LayoutTests/fast/forms/mailto/get-multiple-items-x-www-form-urlencoded.html @@ -8,9 +8,8 @@ Field 2: diff --git a/LayoutTests/fast/forms/mailto/get-multiple-items.html b/LayoutTests/fast/forms/mailto/get-multiple-items.html index 2243589..1ff9f5d 100644 --- a/LayoutTests/fast/forms/mailto/get-multiple-items.html +++ b/LayoutTests/fast/forms/mailto/get-multiple-items.html @@ -9,9 +9,8 @@ Field 2: diff --git a/LayoutTests/fast/forms/mailto/get-non-ascii-always-utf-8.html b/LayoutTests/fast/forms/mailto/get-non-ascii-always-utf-8.html index 546cca8..1dd0eb4 100644 --- a/LayoutTests/fast/forms/mailto/get-non-ascii-always-utf-8.html +++ b/LayoutTests/fast/forms/mailto/get-non-ascii-always-utf-8.html @@ -9,9 +9,8 @@ function test() { if (window.layoutTestController) { layoutTestController.dumpAsText(); - layoutTestController.setCustomPolicyDelegate(true); + layoutTestController.waitForPolicyDelegate(); document.getElementsByTagName("form")[0].submit(); - layoutTestController.setCustomPolicyDelegate(false); } } diff --git a/LayoutTests/fast/forms/mailto/get-non-ascii-text-plain-latin-1.html b/LayoutTests/fast/forms/mailto/get-non-ascii-text-plain-latin-1.html index 9679446..353ac6d 100644 --- a/LayoutTests/fast/forms/mailto/get-non-ascii-text-plain-latin-1.html +++ b/LayoutTests/fast/forms/mailto/get-non-ascii-text-plain-latin-1.html @@ -9,9 +9,8 @@ function test() { if (window.layoutTestController) { layoutTestController.dumpAsText(); - layoutTestController.setCustomPolicyDelegate(true); + layoutTestController.waitForPolicyDelegate(); document.getElementsByTagName("form")[0].submit(); - layoutTestController.setCustomPolicyDelegate(false); } } diff --git a/LayoutTests/fast/forms/mailto/get-non-ascii-text-plain.html b/LayoutTests/fast/forms/mailto/get-non-ascii-text-plain.html index 2b282b8..f5f2402 100644 --- a/LayoutTests/fast/forms/mailto/get-non-ascii-text-plain.html +++ b/LayoutTests/fast/forms/mailto/get-non-ascii-text-plain.html @@ -9,9 +9,8 @@ function test() { if (window.layoutTestController) { layoutTestController.dumpAsText(); - layoutTestController.setCustomPolicyDelegate(true); + layoutTestController.waitForPolicyDelegate(); document.getElementsByTagName("form")[0].submit(); - layoutTestController.setCustomPolicyDelegate(false); } } diff --git a/LayoutTests/fast/forms/mailto/get-non-ascii.html b/LayoutTests/fast/forms/mailto/get-non-ascii.html index 2163245..450d889 100644 --- a/LayoutTests/fast/forms/mailto/get-non-ascii.html +++ b/LayoutTests/fast/forms/mailto/get-non-ascii.html @@ -9,9 +9,8 @@ function test() { if (window.layoutTestController) { layoutTestController.dumpAsText(); - layoutTestController.setCustomPolicyDelegate(true); + layoutTestController.waitForPolicyDelegate(); document.getElementsByTagName("form")[0].submit(); - layoutTestController.setCustomPolicyDelegate(false); } } diff --git a/LayoutTests/fast/forms/mailto/get-overwrite-query.html b/LayoutTests/fast/forms/mailto/get-overwrite-query.html index bffe7ac..99a1934 100644 --- a/LayoutTests/fast/forms/mailto/get-overwrite-query.html +++ b/LayoutTests/fast/forms/mailto/get-overwrite-query.html @@ -8,9 +8,8 @@ function test() { if (window.layoutTestController) { layoutTestController.dumpAsText(); - layoutTestController.setCustomPolicyDelegate(true); + layoutTestController.waitForPolicyDelegate(); document.getElementsByTagName("form")[0].submit(); - layoutTestController.setCustomPolicyDelegate(false); } } diff --git a/LayoutTests/fast/forms/mailto/post-append-query.html b/LayoutTests/fast/forms/mailto/post-append-query.html index 6fd130f..ef9141c 100644 --- a/LayoutTests/fast/forms/mailto/post-append-query.html +++ b/LayoutTests/fast/forms/mailto/post-append-query.html @@ -8,9 +8,8 @@ function test() { if (window.layoutTestController) { layoutTestController.dumpAsText(); - layoutTestController.setCustomPolicyDelegate(true); + layoutTestController.waitForPolicyDelegate(); document.getElementsByTagName("form")[0].submit(); - layoutTestController.setCustomPolicyDelegate(false); } } diff --git a/LayoutTests/fast/forms/mailto/post-multiple-items-multipart-form-data.html b/LayoutTests/fast/forms/mailto/post-multiple-items-multipart-form-data.html index b0d970a..384483c 100644 --- a/LayoutTests/fast/forms/mailto/post-multiple-items-multipart-form-data.html +++ b/LayoutTests/fast/forms/mailto/post-multiple-items-multipart-form-data.html @@ -10,9 +10,8 @@ Line 2 function test() { if (window.layoutTestController) { layoutTestController.dumpAsText(); - layoutTestController.setCustomPolicyDelegate(true); + layoutTestController.waitForPolicyDelegate(); document.getElementsByTagName("form")[0].submit(); - layoutTestController.setCustomPolicyDelegate(false); } } diff --git a/LayoutTests/fast/forms/mailto/post-multiple-items-text-plain.html b/LayoutTests/fast/forms/mailto/post-multiple-items-text-plain.html index 253b9c6..50ccc59 100644 --- a/LayoutTests/fast/forms/mailto/post-multiple-items-text-plain.html +++ b/LayoutTests/fast/forms/mailto/post-multiple-items-text-plain.html @@ -10,9 +10,8 @@ Line 2 function test() { if (window.layoutTestController) { layoutTestController.dumpAsText(); - layoutTestController.setCustomPolicyDelegate(true); + layoutTestController.waitForPolicyDelegate(); document.getElementsByTagName("form")[0].submit(); - layoutTestController.setCustomPolicyDelegate(false); } } diff --git a/LayoutTests/fast/forms/mailto/post-multiple-items-x-www-form-urlencoded.html b/LayoutTests/fast/forms/mailto/post-multiple-items-x-www-form-urlencoded.html index 7216bcf..81f2eeb 100644 --- a/LayoutTests/fast/forms/mailto/post-multiple-items-x-www-form-urlencoded.html +++ b/LayoutTests/fast/forms/mailto/post-multiple-items-x-www-form-urlencoded.html @@ -10,9 +10,8 @@ Line 2 function test() { if (window.layoutTestController) { layoutTestController.dumpAsText(); - layoutTestController.setCustomPolicyDelegate(true); + layoutTestController.waitForPolicyDelegate(); document.getElementsByTagName("form")[0].submit(); - layoutTestController.setCustomPolicyDelegate(false); } } diff --git a/LayoutTests/fast/forms/mailto/post-multiple-items.html b/LayoutTests/fast/forms/mailto/post-multiple-items.html index 24e80df..30cc5d9 100644 --- a/LayoutTests/fast/forms/mailto/post-multiple-items.html +++ b/LayoutTests/fast/forms/mailto/post-multiple-items.html @@ -9,9 +9,8 @@ Field 2: diff --git a/LayoutTests/fast/forms/mailto/post-text-plain-with-accept-charset.html b/LayoutTests/fast/forms/mailto/post-text-plain-with-accept-charset.html index c2372d2..2c1a22c 100644 --- a/LayoutTests/fast/forms/mailto/post-text-plain-with-accept-charset.html +++ b/LayoutTests/fast/forms/mailto/post-text-plain-with-accept-charset.html @@ -13,9 +13,8 @@ function test() { if (window.layoutTestController) { layoutTestController.dumpAsText(); - layoutTestController.setCustomPolicyDelegate(true); + layoutTestController.waitForPolicyDelegate(); document.getElementsByTagName("form")[0].submit(); - layoutTestController.setCustomPolicyDelegate(false); } } diff --git a/LayoutTests/fast/forms/mailto/post-text-plain.html b/LayoutTests/fast/forms/mailto/post-text-plain.html index df26d1d..41719ac 100644 --- a/LayoutTests/fast/forms/mailto/post-text-plain.html +++ b/LayoutTests/fast/forms/mailto/post-text-plain.html @@ -13,9 +13,8 @@ function test() { if (window.layoutTestController) { layoutTestController.dumpAsText(); - layoutTestController.setCustomPolicyDelegate(true); + layoutTestController.waitForPolicyDelegate(); document.getElementsByTagName("form")[0].submit(); - layoutTestController.setCustomPolicyDelegate(false); } } -- 1.8.3.1