Changeset 66201 in webkit

Timestamp:

Aug 27, 2010 4:15:02 AM (14 years ago)

Author:

steveblock@google.com

Message:

2010-08-27 Steve Block <​steveblock@google.com>

Reviewed by Darin Adler.

js-test-post.js is not robust for asynchronous tests
​https://bugs.webkit.org/show_bug.cgi?id=44642

This patch moves finishJSTest() to js-test-pre.js to make it available for when an
asynchronous test completes before js-test-post.js has been parsed, and updates
js-test-post.js to handle this case.

• fast/dom/Window/window-property-descriptors-expected.txt:
• fast/js/resources/js-test-post.js:
• fast/js/resources/js-test-pre.js: (finishJSTest):

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• fast/dom/Window/window-property-descriptors-expected.txt (modified) (1 diff)
• fast/js/resources/js-test-post.js (modified) (1 diff)
• fast/js/resources/js-test-pre.js (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-08-27  Steve Block  <steveblock@google.com>
+
+        Reviewed by Darin Adler.
+
+        js-test-post.js is not robust for asynchronous tests
+        https://bugs.webkit.org/show_bug.cgi?id=44642
+
+        This patch moves finishJSTest() to js-test-pre.js to make it available for when an
+        asynchronous test completes before js-test-post.js has been parsed, and updates
+        js-test-post.js to handle this case.
+
+        * fast/dom/Window/window-property-descriptors-expected.txt:
+        * fast/js/resources/js-test-post.js:
+        * fast/js/resources/js-test-pre.js:
+        (finishJSTest):
+
 2010-08-27  Nikolas Zimmermann  <nzimmermann@rim.com>
 

trunk/LayoutTests/fast/dom/Window/window-property-descriptors-expected.txt

@@ -348 +348 @@
 PASS typeof Object.getOwnPropertyDescriptor(window, 'evalAndLog') is 'object'
 PASS typeof Object.getOwnPropertyDescriptor(window, 'event') is 'object'
+PASS typeof Object.getOwnPropertyDescriptor(window, 'finishJSTest') is 'object'
 PASS typeof Object.getOwnPropertyDescriptor(window, 'frameElement') is 'object'
 PASS typeof Object.getOwnPropertyDescriptor(window, 'frames') is 'object'

trunk/LayoutTests/fast/js/resources/js-test-post.js

@@ -1 @@
-function finishJSTest()
-{
-    shouldBeTrue("successfullyParsed");
-    debug('<br /><span class="pass">TEST COMPLETE</span>');
-    if (window.jsTestIsAsync && window.layoutTestController)
-        layoutTestController.notifyDone();
-}
+wasPostTestScriptParsed = true;
 
 if (window.jsTestIsAsync) {
     if (window.layoutTestController)
         layoutTestController.waitUntilDone();
+    if (window.wasFinishJSTestCalled)
+        finishJSTest();
 } else
     finishJSTest();

trunk/LayoutTests/fast/js/resources/js-test-pre.js

@@ -281 +281 @@
     }
 }
+
+// It's possible for an async test to call finishJSTest() before js-test-post.js
+// has been parsed.
+function finishJSTest()
+{
+    wasFinishJSTestCalled = true;
+    if (!window.wasPostTestScriptParsed)
+        return;
+    shouldBeTrue("successfullyParsed");
+    debug('<br /><span class="pass">TEST COMPLETE</span>');
+    if (window.jsTestIsAsync && window.layoutTestController)
+        layoutTestController.notifyDone();
+}