Changeset 19622 in webkit

Timestamp:

Feb 14, 2007, 9:13:32 AM (18 years ago)

Author:

ggaren

Message:

Reviewed by Beth Dakin.

Blind attempt to make this test more reliable. (It fails intermittently
on the buildbot.)

• editing/execCommand/find-after-replace-expected.checksum:
• editing/execCommand/find-after-replace-expected.png:
• editing/execCommand/find-after-replace-expected.txt:
• editing/execCommand/find-after-replace.html: Use a load event handler instead of a 100ms timer. There's no guarantee that everything will be done loading in under 100ms (and there's no reason to wait that long all the time, either!).

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• editing/execCommand/find-after-replace-expected.checksum (modified) (1 diff)
• editing/execCommand/find-after-replace-expected.png (modified) ( previous)
• editing/execCommand/find-after-replace-expected.txt (modified) (2 diffs)
• editing/execCommand/find-after-replace.html (modified) (2 diffs)

trunk/LayoutTests/ChangeLog ¶

@@ +1 @@
+2007-02-14  Geoffrey Garen  <ggaren@apple.com>
+
+        Reviewed by Beth Dakin.
+        
+        Blind attempt to make this test more reliable. (It fails intermittently
+        on the buildbot.)
+
+        * editing/execCommand/find-after-replace-expected.checksum:
+        * editing/execCommand/find-after-replace-expected.png:
+        * editing/execCommand/find-after-replace-expected.txt:
+        * editing/execCommand/find-after-replace.html: Use a load event handler
+        instead of a 100ms timer. There's no guarantee that everything will be
+        done loading in under 100ms (and there's no reason to wait that long all
+        the time, either!).
+
 2007-02-14  Mitz Pettel  <mitz@webkit.org>
 

trunk/LayoutTests/editing/execCommand/find-after-replace-expected.checksum ¶

@@ -1 @@
-5a0bfef92ff7528e42106cea8dde4577
+dcb24bbc2bafc4c7b553a7048ccccb8e

trunk/LayoutTests/editing/execCommand/find-after-replace-expected.txt ¶

@@ -7 +7 @@
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
 EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 4 of #text > BODY > HTML > #document to 5 of #text > BODY > HTML > #document givenAction:WebViewInsertActionPasted
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 4 of #text > BODY > HTML > #document to 0 of #text > BODY > HTML > #document toDOMRange:range from 3 of #text > BODY > HTML > #document to 3 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 3 of #text > BODY > HTML > #document to 0 of #text > BODY > HTML > #document toDOMRange:range from 3 of #text > BODY > HTML > #document to 3 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
 EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
@@ -27 +27 @@
             RenderBlock {HTML} at (0,0) size 300x150
               RenderBody {BODY} at (8,8) size 284x134 [bgcolor=#FFFFE0]
-                RenderText {#text} at (0,0) size 31x18
-                  text run at (0,0) width 31: "A B "
-                RenderText {#text} at (31,0) size 27x18
-                  text run at (31,0) width 27: "A B"
+                RenderText {#text} at (0,0) size 27x18
+                  text run at (0,0) width 27: "A B"
+                RenderText {#text} at (27,0) size 27x18
+                  text run at (27,0) width 27: "A B"
+                RenderText {#text} at (54,0) size 4x18
+                  text run at (54,0) width 4: " "
         RenderText {#text} at (0,0) size 0x0
         RenderText {#text} at (0,0) size 0x0

trunk/LayoutTests/editing/execCommand/find-after-replace.html ¶

@@ -1 @@
-<script>
-if (window.layoutTestController)
-     layoutTestController.dumpEditingCallbacks();
-</script>
 <p>This tests find and replace inside an editable iframe.  You should see 'A B A B' below. With bug 4462420, you would see 'A B B A'.</p>
 <iframe src="../resources/contenteditable-iframe-src.html"></iframe>
 
 <script>
-function runTest() {
+if (window.layoutTestController) {
+    layoutTestController.dumpEditingCallbacks();
+    layoutTestController.waitUntilDone();
+}
+
+window.onload = function onload() {
     var frame = frames[0];
     var sel = frame.getSelection();
@@ -19 +20 @@
     doc.execCommand("FindString", false, "A");
     doc.execCommand("Paste");
+
     if (window.layoutTestController)
         window.layoutTestController.notifyDone();
 }
-if (window.layoutTestController)
-    window.layoutTestController.waitUntilDone();
-window.setTimeout(runTest, 100);
 </script>