WebCore:
authormjs <mjs@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 11 Aug 2005 09:39:49 +0000 (09:39 +0000)
committermjs <mjs@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 11 Aug 2005 09:39:49 +0000 (09:39 +0000)
        At Least Rougly Glanced At by Anders.

- fix change with totally breaks the layout tests.

Changed all the tests below to avoid dumping more than once -
since this now prints more than one separator, it totally throws
off the layout test driver so it needs to be avoided.

        * layout-tests/dom/html/level2/html/HTMLFormElement10-expected.txt:
        * layout-tests/dom/html/level2/html/HTMLFormElement10.html:
        * layout-tests/dom/html/level2/html/HTMLFormElement10.js:
        * layout-tests/fast/events/onunload-expected.txt:
        * layout-tests/fast/events/onunload.html:
        * layout-tests/fast/js/location-assign-expected.txt:
        * layout-tests/fast/js/location-assign.html:

WebKitTools:

        At Least Rougly Glanced At by Anders.

- fix change with totally breaks the layout tests.

        * DumpRenderTree/DumpRenderTree.m:
        (-[WaitUntilDoneDelegate webView:didCommitLoadForFrame:]): Make tests unready if you start another
load, to avoid dumping twice accidentally.

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

LayoutTests/dom/html/level2/html/HTMLFormElement10-expected.txt
LayoutTests/dom/html/level2/html/HTMLFormElement10.html
LayoutTests/dom/html/level2/html/HTMLFormElement10.js
LayoutTests/fast/events/onunload-expected.txt
LayoutTests/fast/events/onunload.html
LayoutTests/fast/js/location-assign-expected.txt
LayoutTests/fast/js/location-assign.html
WebCore/ChangeLog-2005-08-23
WebKitTools/ChangeLog
WebKitTools/DumpRenderTree/DumpRenderTree.m

index 365cceafeee36923c2f65beb241e2499e4f75d4a..2c7dbef98bf09a33ba158d4fbdcf760abdb8dbea 100644 (file)
@@ -5,7 +5,7 @@
 <TITLE>FORM3</TITLE>
 <script type='text/javascript' src='selfhtml.js'></script><script charset='UTF-8' type='text/javascript' src='HTMLFormElement10.js'></script><script type='text/javascript'>function loadComplete() { startTest(); }</script></HEAD>
 <BODY onload="loadComplete()">
-<FORM ID="form1" ACTION="about:blank">
+<FORM ID="form1" ACTION="data:text/html,<script>if(window.layoutTestController){layoutTestController.notifyDone();}</script><span style='visibility: hidden'>">
 <P>
 <TEXTAREA NAME="text1" COLS="20" ROWS="7"></TEXTAREA>
 <INPUT TYPE="submit" NAME="submit1" VALUE="Submit" />
index 769b38815d6b6be910cad95d2a9e368f64d38ce2..987ee3b42624067a153dfad99f2b03900e28fe5c 100644 (file)
@@ -95,6 +95,10 @@ function HTMLFormElement10() {
       nodeList = doc.getElementsByTagName("form");
       assertSize("Asize",1,nodeList);
 testNode = nodeList.item(0);
+
+      if (window.layoutTestController)
+          layoutTestController.waitUntilDone();
+
       testNode.submit();
       
 }
index 16f486d11f7be3196935ef39485a677f3b34897c..908c920c1392d11a136e2021a6499ba991baf096 100644 (file)
@@ -1,15 +1,2 @@
 ALERT: unload
-layer at (0,0) size 800x600
-  RenderCanvas at (0,0) size 800x600
-layer at (0,0) size 800x34
-  RenderBlock {HTML} at (0,0) size 800x34
-    RenderBody {BODY} at (8,8) size 784x18
-      RenderText {TEXT} at (0,0) size 287x18
-        text run at (0,0) width 287: "You should have seen an unload alert appear."
-layer at (0,0) size 800x600
-  RenderCanvas at (0,0) size 800x600
-layer at (0,0) size 800x34
-  RenderBlock {HTML} at (0,0) size 800x34
-    RenderBody {BODY} at (8,8) size 784x18
-      RenderText {TEXT} at (0,0) size 287x18
-        text run at (0,0) width 287: "You should have seen an unload alert appear."
+You should have seen an unload alert appear.
index 8822078afb5b528c85b68407c20d1672c5407ba1..768602364801aede80dca956549a883f07ad5f36 100644 (file)
@@ -1,8 +1,10 @@
 <html>
 <body onunload="unload()" onload="load()">
 <script>
-if (window.layoutTestController)
+if (window.layoutTestController) {
+    layoutTestController.dumpAsText();
     layoutTestController.waitUntilDone();
+}
 
 function load()
 {
index 2f44dec73c81e40629dae86a00449ecc84a960b6..fff64d41a04cae83a6c475daeb4b822449dc848c 100644 (file)
@@ -1,12 +1 @@
-layer at (0,0) size 800x600
-  RenderCanvas at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderCanvas at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderText {TEXT} at (0,0) size 608x18
-        text run at (0,0) width 608: "If this text is shown, that means that the document was successfully loaded using location.assign."
-      RenderText {TEXT} at (0,0) size 0x0
+If this text is shown, that means that the document was successfully loaded using location.assign.
index 59bfee4b0cb90c1442854f9e6f496c1e37435e88..e62f4ab58f0a89c7cf08a445c3350ec49e6fd67c 100644 (file)
@@ -1,12 +1,15 @@
 <html>
 <script>
-if (window.layoutTestController)
+if (window.layoutTestController) {
     layoutTestController.waitUntilDone();
+    layoutTestController.dumpAsText();
+}
 
 function runTests() {
    window.location.assign('resources/new-location.html');
 }
 </script>
 <body onload="runTests();">
+FAIL
 </body>
 </html>
index 47aa1d1f4667138c0db77c201024f55b2f175d7d..a86ab8aa40e196e3d5a7874ca4e767e08e4ec7b0 100644 (file)
@@ -1,3 +1,21 @@
+2005-08-11  Maciej Stachowiak  <mjs@apple.com>
+
+        At Least Rougly Glanced At by Anders.
+
+       - fix change with totally breaks the layout tests.
+
+       Changed all the tests below to avoid dumping more than once -
+       since this now prints more than one separator, it totally throws
+       off the layout test driver so it needs to be avoided.
+       
+        * layout-tests/dom/html/level2/html/HTMLFormElement10-expected.txt:
+        * layout-tests/dom/html/level2/html/HTMLFormElement10.html:
+        * layout-tests/dom/html/level2/html/HTMLFormElement10.js:
+        * layout-tests/fast/events/onunload-expected.txt:
+        * layout-tests/fast/events/onunload.html:
+        * layout-tests/fast/js/location-assign-expected.txt:
+        * layout-tests/fast/js/location-assign.html:
+
 2005-08-10  Geoffrey Garen  <ggaren@apple.com>
 
         -added layout test for fix to <rdar://problem/4151132> REGRESSION: Some applet 
index c674406a3df1393f62c47d85ebea6c3f586ff3fb..1d03714e15714c91a518196772c714895f471df2 100644 (file)
@@ -1,3 +1,13 @@
+2005-08-11  Maciej Stachowiak  <mjs@apple.com>
+
+        At Least Rougly Glanced At by Anders.
+
+       - fix change with totally breaks the layout tests.
+
+        * DumpRenderTree/DumpRenderTree.m:
+        (-[WaitUntilDoneDelegate webView:didCommitLoadForFrame:]): Make tests unready if you start another
+       load, to avoid dumping twice accidentally.
+
 2005-08-10  Eric Seidel  <eseidel@apple.com>
         Fixed made by Mitz Pettel <opendarwin.org@mitzpettel.com>
 
index 49d77b435db732ed1a5196f404fcb734f7dbc8a5..d61fe90d6930cb5d97ff2d17823312c68e743d6a 100644 (file)
@@ -214,6 +214,12 @@ static void dump(void)
     }
 }
 
+- (void)webView:(WebView *)sender didCommitLoadForFrame:(WebFrame *)f
+{
+    if (frame == f)
+        readyToDump = NO;
+}
+
 - (void)webView:(WebView *)sender didFailProvisionalLoadWithError:(NSError *)error forFrame:(WebFrame *)frame
 {
     [self webView:sender locationChangeDone:error forDataSource:[frame provisionalDataSource]];