Changeset 120450 in webkit

Timestamp:

Jun 15, 2012, 7:07:22 AM (14 years ago)

Author:

rniwa@webkit.org

Message:

Use testRunner instead of layoutTestController in layout test resources
​https://bugs.webkit.org/show_bug.cgi?id=89182

Reviewed by Kent Tamura.

• resources/dump-as-markup.js:

(Markup.waitUntilDone):
(Markup.notifyDone):

• resources/magnitude-perf.js:

(Magnitude._run):
(Magnitude._runIteration):
(Magnitude):

• resources/testharnessreport.js:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• resources/dump-as-markup.js (modified) (5 diffs)
• resources/magnitude-perf.js (modified) (4 diffs)
• resources/testharnessreport.js (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-06-15  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Use testRunner instead of layoutTestController in layout test resources
+        https://bugs.webkit.org/show_bug.cgi?id=89182
+
+        Reviewed by Kent Tamura.
+
+        * resources/dump-as-markup.js:
+        (Markup.waitUntilDone):
+        (Markup.notifyDone):
+        * resources/magnitude-perf.js:
+        (Magnitude._run):
+        (Magnitude._runIteration):
+        (Magnitude):
+        * resources/testharnessreport.js:
+
 2012-06-15  Zan Dobersek  <zandobersek@gmail.com>
 

trunk/LayoutTests/resources/dump-as-markup.js

@@ -15 +15 @@
  */
 
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 // Namespace
@@ -62 +62 @@
     }
 
-    // FIXME: Have this respect layoutTestController.dumpChildFramesAsText?
+    // FIXME: Have this respect testRunner.dumpChildFramesAsText?
     // FIXME: Should we care about framesets?
     // DocumentFragment doesn't have a getElementsByTagName method.
@@ -93 +93 @@
 Markup.waitUntilDone = function()
 {
-    if (window.layoutTestController)
-        layoutTestController.waitUntilDone();
+    if (window.testRunner)
+        testRunner.waitUntilDone();
     Markup.noAutoDump();
 }
@@ -101 +101 @@
 {
     // Need to waitUntilDone or some tests won't finish appending the markup before the text is dumped.
-    if (window.layoutTestController)
-        layoutTestController.waitUntilDone();
+    if (window.testRunner)
+        testRunner.waitUntilDone();
 
     // If dump has already been called, don't bother to dump again
@@ -111 +111 @@
     // clobber the test itself. But when in layout test mode, we don't want
     // side effects from the test to be included in the results.
-    if (window.layoutTestController)
+    if (window.testRunner)
         document.body.innerHTML = '';
 
     document.body.appendChild(Markup._container);
 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 }
 

trunk/LayoutTests/resources/magnitude-perf.js

@@ -14 +14 @@
 // -expected is one of the run-time constants listed below (e.g. Magnitude.CONSTANT).
 
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 // Namespace.
@@ -101 +101 @@
         // By default don't log detailed information to layout test results to keep expected results
         // consistent from run to run.
-        if (!window.layoutTestController || bigO != expected)
+        if (!window.testRunner || bigO != expected)
             Magnitude._log(Magnitude._debugLog);
     } else {
@@ -223 +223 @@
     if (window.chromium) {
       // FIXME: If using microseconds turns out to be less flaky, expose microseconds
-      // from JSC or layoutTestController and use them. Otherwise, get rid of this block.
+      // from JSC or testRunner and use them. Otherwise, get rid of this block.
       var microseconds = milliseconds * 1000;
       var interval = new chromium.Interval();
@@ -250 +250 @@
 window.addEventListener('load', function() {
     // FIXME: Add Magnitude.waitUntilDone/notifyDone for tests that need to operate after the load event has fired.
-    if (window.layoutTestController)
+    if (window.testRunner)
         document.body.innerHTML = '';
     document.body.appendChild(Magnitude._container);

trunk/LayoutTests/resources/testharnessreport.js

@@ -14 +14 @@
 
 // Setup for WebKit JavaScript tests
-if (self.layoutTestController)
-    layoutTestController.dumpAsText();
+if (self.testRunner)
+    testRunner.dumpAsText();
 
 // Function used to convert the test status code into