2009-03-06 Darin Adler <darin@apple.com>

        Fixed broken test I just landed for bug 24422.

        * fast/dom/location-new-window-no-crash-expected.txt: Updated.
        * fast/dom/resources/location-new-window-no-crash.js: Added code to make the window
        opening and closing work in DumpRenderTree.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@41502 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 395dd77..b0aa336 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,11 @@
+2009-03-06  Darin Adler  <darin@apple.com>
+
+        Fixed broken test I just landed for bug 24422.
+
+        * fast/dom/location-new-window-no-crash-expected.txt: Updated.
+        * fast/dom/resources/location-new-window-no-crash.js: Added code to make the window
+        opening and closing work in DumpRenderTree.
+

 2009-03-06  Dmitry Titov  <dimich@chromium.org>
 
         Reviewed by Alexey Proskuryakov.
 2009-03-06  Dmitry Titov  <dimich@chromium.org>
 
         Reviewed by Alexey Proskuryakov.

diff --git a/LayoutTests/fast/dom/location-new-window-no-crash-expected.txt b/LayoutTests/fast/dom/location-new-window-no-crash-expected.txt
index 47de4b5..289bb9c 100644 (file)
--- a/LayoutTests/fast/dom/location-new-window-no-crash-expected.txt
+++ b/LayoutTests/fast/dom/location-new-window-no-crash-expected.txt
@@ -1,39 +1,38 @@
-CONSOLE MESSAGE: line 42: TypeError: Result of expression 'testWindow' [undefined] is not an object.
-Tests that manipulating location properties in a just-created window object does not crash.
+Tests that manipulating location properties in a just-created window object does not crash. Note: Turn off pop-up blocking to run this in-browser.

 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 

-FAIL testWindow.location.toString() should be /. Threw exception TypeError: Result of expression 'testWindow' [undefined] is not an object.
-FAIL testWindow.location.href should be /. Threw exception TypeError: Result of expression 'testWindow' [undefined] is not an object.
-FAIL testWindow.location.protocol should be :. Threw exception TypeError: Result of expression 'testWindow' [undefined] is not an object.
-FAIL testWindow.location.host should be . Threw exception TypeError: Result of expression 'testWindow' [undefined] is not an object.
-FAIL testWindow.location.hostname should be . Threw exception TypeError: Result of expression 'testWindow' [undefined] is not an object.
-FAIL testWindow.location.port should be . Threw exception TypeError: Result of expression 'testWindow' [undefined] is not an object.
-FAIL testWindow.location.pathname should be /. Threw exception TypeError: Result of expression 'testWindow' [undefined] is not an object.
-FAIL testWindow.location.search should be . Threw exception TypeError: Result of expression 'testWindow' [undefined] is not an object.
-FAIL testWindow.location.hash should be . Threw exception TypeError: Result of expression 'testWindow' [undefined] is not an object.
-FAIL testWindow.location.href = 'data:text/plain,b' should be data:text/plain,b. Threw exception TypeError: Result of expression 'testWindow' [undefined] is not an object.
-FAIL testWindow.location.protocol = 'data' should be data. Threw exception TypeError: Result of expression 'testWindow' [undefined] is not an object.
-FAIL testWindow.location.host = 'c' should be c. Threw exception TypeError: Result of expression 'testWindow' [undefined] is not an object.
-FAIL testWindow.location.hostname = 'd' should be d. Threw exception TypeError: Result of expression 'testWindow' [undefined] is not an object.
-FAIL testWindow.location.port = 'e' should be e. Threw exception TypeError: Result of expression 'testWindow' [undefined] is not an object.
-FAIL testWindow.location.pathname = 'f' should be f. Threw exception TypeError: Result of expression 'testWindow' [undefined] is not an object.
-FAIL testWindow.location.search = 'g' should be g. Threw exception TypeError: Result of expression 'testWindow' [undefined] is not an object.
-FAIL testWindow.location.hash = 'h' should be h. Threw exception TypeError: Result of expression 'testWindow' [undefined] is not an object.
-FAIL testWindow.location.assign('data:text/plain,i') should be undefined. Threw exception TypeError: Result of expression 'testWindow' [undefined] is not an object.
-FAIL testWindow.location.replace('data:text/plain,j') should be undefined. Threw exception TypeError: Result of expression 'testWindow' [undefined] is not an object.
-FAIL testWindow.location.reload() should be undefined. Threw exception TypeError: Result of expression 'testWindow' [undefined] is not an object.
-FAIL testWindow.location.toString() should be /. Threw exception TypeError: Result of expression 'testWindow' [undefined] is not an object.
-FAIL testWindow.location.href should be /. Threw exception TypeError: Result of expression 'testWindow' [undefined] is not an object.
-FAIL testWindow.location.protocol should be :. Threw exception TypeError: Result of expression 'testWindow' [undefined] is not an object.
-FAIL testWindow.location.host should be . Threw exception TypeError: Result of expression 'testWindow' [undefined] is not an object.
-FAIL testWindow.location.hostname should be . Threw exception TypeError: Result of expression 'testWindow' [undefined] is not an object.
-FAIL testWindow.location.port should be . Threw exception TypeError: Result of expression 'testWindow' [undefined] is not an object.
-FAIL testWindow.location.pathname should be /. Threw exception TypeError: Result of expression 'testWindow' [undefined] is not an object.
-FAIL testWindow.location.search should be . Threw exception TypeError: Result of expression 'testWindow' [undefined] is not an object.
-FAIL testWindow.location.hash should be . Threw exception TypeError: Result of expression 'testWindow' [undefined] is not an object.
-FAIL successfullyParsed should be true (of type boolean). Was undefined (of type undefined).
+PASS testWindow.location.toString() is '/'
+PASS testWindow.location.href is '/'
+PASS testWindow.location.protocol is ':'
+PASS testWindow.location.host is ''
+PASS testWindow.location.hostname is ''
+PASS testWindow.location.port is ''
+PASS testWindow.location.pathname is '/'
+PASS testWindow.location.search is ''
+PASS testWindow.location.hash is ''
+PASS testWindow.location.href = 'data:text/plain,b' is 'data:text/plain,b'
+PASS testWindow.location.protocol = 'data' is 'data'
+PASS testWindow.location.host = 'c' is 'c'
+PASS testWindow.location.hostname = 'd' is 'd'
+PASS testWindow.location.port = 'e' is 'e'
+PASS testWindow.location.pathname = 'f' is 'f'
+PASS testWindow.location.search = 'g' is 'g'
+PASS testWindow.location.hash = 'h' is 'h'
+PASS testWindow.location.assign('data:text/plain,i') is undefined
+PASS testWindow.location.replace('data:text/plain,j') is undefined
+PASS testWindow.location.reload() is undefined
+PASS testWindow.location.toString() is '/'
+PASS testWindow.location.href is '/'
+PASS testWindow.location.protocol is ':'
+PASS testWindow.location.host is ''
+PASS testWindow.location.hostname is ''
+PASS testWindow.location.port is ''
+PASS testWindow.location.pathname is '/'
+PASS testWindow.location.search is ''
+PASS testWindow.location.hash is ''
+PASS successfullyParsed is true

 
 TEST COMPLETE
 
 
 TEST COMPLETE
 

diff --git a/LayoutTests/fast/dom/resources/location-new-window-no-crash.js b/LayoutTests/fast/dom/resources/location-new-window-no-crash.js
index 109cac3..629bc8d 100644 (file)
--- a/LayoutTests/fast/dom/resources/location-new-window-no-crash.js
+++ b/LayoutTests/fast/dom/resources/location-new-window-no-crash.js
@@ -1,4 +1,9 @@
-description("Tests that manipulating location properties in a just-created window object does not crash.");
+description("Tests that manipulating location properties in a just-created window object does not crash. Note: Turn off pop-up blocking to run this in-browser.");
+
+if (window.layoutTestController) {
+    layoutTestController.waitUntilDone();
+    layoutTestController.setCanOpenWindows();
+}

 
 var testWindow = open("data:text/plain,a");
 
 
 var testWindow = open("data:text/plain,a");
 


@@ -25,9 +30,9 @@ shouldBe("testWindow.location.pathname = 'f'", "'f'"); // Firefox throws an exce
 shouldBe("testWindow.location.search = 'g'", "'g'");
 shouldBe("testWindow.location.hash = 'h'", "'h'");
 
 shouldBe("testWindow.location.search = 'g'", "'g'");
 shouldBe("testWindow.location.hash = 'h'", "'h'");
 

-shouldBe("testWindow.location.assign('data:text/plain,i')", "undefined"); // Firefox returns about:blank
-shouldBe("testWindow.location.replace('data:text/plain,j')", "undefined"); // Firefox returns about:blank
-shouldBe("testWindow.location.reload()", "undefined"); // Firefox returns about:blank
+shouldBe("testWindow.location.assign('data:text/plain,i')", "undefined");
+shouldBe("testWindow.location.replace('data:text/plain,j')", "undefined");
+shouldBe("testWindow.location.reload()", "undefined");

 
 shouldBe("testWindow.location.toString()", "'/'"); // Firefox returns about:blank
 shouldBe("testWindow.location.href", "'/'"); // Firefox returns about:blank
 
 shouldBe("testWindow.location.toString()", "'/'"); // Firefox returns about:blank
 shouldBe("testWindow.location.href", "'/'"); // Firefox returns about:blank


@@ -41,4 +46,16 @@ shouldBe("testWindow.location.hash", "''");
 
 testWindow.close();
 
 
 testWindow.close();
 

+if (window.layoutTestController) {
+    function doneHandler()
+    {
+        if (testWindow.closed) {
+            layoutTestController.notifyDone();
+            return;
+        }
+        setTimeout(doneHandler, 0);
+    }
+    doneHandler();
+}
+

 var successfullyParsed = true;
 var successfullyParsed = true;