Reviewed by Alexey.

        <rdar://problem/5313518> fast/events/iframe-object-onload.html shows events out of order on Leopard

        Fix test so that it doesn't matter in what order the frames/objects are loaded. This is done by keeping
        the load logs in an array and sort it before dumping it.

        * fast/events/iframe-object-onload-expected.txt:
        * fast/events/iframe-object-onload.html:
        * mac/leopard/Skipped:

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 0d3ad49268f8870f9d63cfa42d1d6a8388a1f841..25fd7843ee0d91868a4a81434f884707aef9702b 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2007-07-06  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Alexey.
+
+        <rdar://problem/5313518> fast/events/iframe-object-onload.html shows events out of order on Leopard
+        
+        Fix test so that it doesn't matter in what order the frames/objects are loaded. This is done by keeping
+        the load logs in an array and sort it before dumping it.
+        
+        * fast/events/iframe-object-onload-expected.txt:
+        * fast/events/iframe-object-onload.html:
+        * mac/leopard/Skipped:
+
 2007-07-06  Anders Carlsson  <andersca@apple.com>
 
         Reviewed by Alexey.

diff --git a/LayoutTests/fast/events/iframe-object-onload-expected.txt b/LayoutTests/fast/events/iframe-object-onload-expected.txt
index bb0be3bba15bc3ad33a3950e27bb7412f3604a7e..2b6a0c96aad2ee14e10cdfed8a6d19f2122aaf52 100644 (file)
--- a/LayoutTests/fast/events/iframe-object-onload-expected.txt
+++ b/LayoutTests/fast/events/iframe-object-onload-expected.txt
@@ -1,26 +1,26 @@
 This test checks that onload events fire on iframe and object elements when their contents finish loading, and that these are separate event objects from those that fire on the body inside the frame. If it passes, you will see 6 blocks below, each with a three-line message that ends in false.
 Fired load event on body inside iframe
-Fired event on iframe
+Fired event on iframe even though default was prevented
 Outer event same as inner: false
 ------
 Fired load event on body inside iframe
-Fired event on iframe even though default was prevented
+Fired event on iframe
 Outer event same as inner: false
 ------
 Fired load event on body inside object
-Fired event on object even though propagation was stopped
+Fired event on object even though default was prevented
 Outer event same as inner: false
 ------
 Fired load event on body inside object
-Fired event on object
+Fired event on object even though propagation was stopped
 Outer event same as inner: false
 ------
 Fired load event on body inside object
-Fired event on object even though default was prevented
+Fired event on object even though propagation was stopped
 Outer event same as inner: false
 ------
 Fired load event on body inside object
-Fired event on object even though propagation was stopped
+Fired event on object
 Outer event same as inner: false
 ------
         

diff --git a/LayoutTests/fast/events/iframe-object-onload.html b/LayoutTests/fast/events/iframe-object-onload.html
index 5670fa838b257331decd87abb1b31ca4ae95ad16..3d6544222a4c138866d62b1eace2689d5773c7a1 100644 (file)
--- a/LayoutTests/fast/events/iframe-object-onload.html
+++ b/LayoutTests/fast/events/iframe-object-onload.html
@@ -13,16 +13,26 @@ if (window.layoutTestController)
 
 function log(s)
 {
-    document.getElementById("console").innerHTML += s + "<br>";
+    currentLogEntry += s + "<br>";    
 }
 
 var innerEvent = null;
+var logArray = [];
+var currentLogEntry = '';
 
 function logOuter(msg, event)
 {
     log(msg);
     log('Outer event same as inner: ' + (innerEvent == event));
     log('------');
+
+    logArray.push(currentLogEntry);
+    currentLogEntry = '';
+    
+    if (logArray.length == 6) {
+        logArray.sort();
+        document.getElementById("console").innerHTML = logArray.join('');
+    }
 }
 
 function logInner(tag, event)

diff --git a/LayoutTests/mac/leopard/Skipped b/LayoutTests/mac/leopard/Skipped
index 72e66b6b0b5255e7a489ffc8ac88651e3dbdd477..a7fc008fd3b2da13dc0b72ce4ea187284bab377f 100644 (file)
--- a/LayoutTests/mac/leopard/Skipped
+++ b/LayoutTests/mac/leopard/Skipped
@@ -20,9 +20,6 @@ svg/hixie/text/003.html
 svg/hixie/text/003a.xml
 svg/hixie/viewbox/preserveAspectRatio/002.xml
 
-# <rdar://problem/5313518> fast/events/iframe-object-onload.html shows events out of order on Leopard
-fast/events/iframe-object-onload.html
-
 # <rdar://problem/5313504> Some http/tests/navigation tests are missing back items on Leopard
 http/tests/navigation/document-location-click-timeout.html
 http/tests/navigation/document-location-click.html