Changeset 139332 in webkit

Timestamp:

Jan 10, 2013, 10:25:39 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: Refactor InspectorTest to create output interface
​https://bugs.webkit.org/show_bug.cgi?id=106231

Patch by John J. Barton <​johnjbarton@chromium.org> on 2013-01-10
Reviewed by Pavel Feldman.

Refactor InspectorTest to extract InspectorTest.Output, the API
used between InspectorTest and the test output reciever (the
test-script page by default).

• http/tests/inspector/inspector-test.js:

(initialize_InspectorTest.InspectorTest.Output.testComplete):
(initialize_InspectorTest.InspectorTest.Output.addResult):
(initialize_InspectorTest.InspectorTest.Output.clearResults):
(initialize_InspectorTest.InspectorTest.completeTest):
(initialize_InspectorTest.InspectorTest.addResult):

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• http/tests/inspector/inspector-test.js (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-10  John J. Barton  <johnjbarton@chromium.org>
+
+        Web Inspector: Refactor InspectorTest to create output interface
+        https://bugs.webkit.org/show_bug.cgi?id=106231
+
+        Reviewed by Pavel Feldman.
+
+        Refactor InspectorTest to extract InspectorTest.Output, the API 
+        used between InspectorTest and the test output reciever (the 
+        test-script page by default).
+
+        * http/tests/inspector/inspector-test.js:
+        (initialize_InspectorTest.InspectorTest.Output.testComplete):
+        (initialize_InspectorTest.InspectorTest.Output.addResult):
+        (initialize_InspectorTest.InspectorTest.Output.clearResults):
+        (initialize_InspectorTest.InspectorTest.completeTest):
+        (initialize_InspectorTest.InspectorTest.addResult):
+
 2013-01-10  Max Vujovic  <mvujovic@adobe.com>
 

trunk/LayoutTests/http/tests/inspector/inspector-test.js

@@ -12 +12 @@
 console.error = consoleOutputHook.bind(InspectorTest, "error");
 console.info = consoleOutputHook.bind(InspectorTest, "info");
+
+InspectorTest.Output = {   // override in window.initialize_yourName
+    testComplete: function() 
+    {
+        RuntimeAgent.evaluate("didEvaluateForTestInFrontend(" + InspectorTest.completeTestCallId + ", \"\")", "test");
+    },
+
+    addResult: function(text) 
+    {
+        InspectorTest.evaluateInPage("output(unescape('" + escape(text) + "'))");
+    },
+    
+    clearResults: function() 
+    {
+        InspectorTest.evaluateInPage("clearOutput()");
+    }
+};
 
 InspectorTest.completeTest = function()
@@ -21 +38 @@
             return;
         }
-        RuntimeAgent.evaluate("didEvaluateForTestInFrontend(" + InspectorTest.completeTestCallId + ", \"\")", "test");
+        InspectorTest.Output.testComplete();
     }
     testDispatchQueueIsEmpty();
@@ -74 +91 @@
     results.push(text);
     if (resultsSynchronized)
-        addResultToPage(text);
+        InspectorTest.Output.addResult(text);
     else {
-        clearResults();
+        InspectorTest.Output.clearResults();
         for (var i = 0; i < results.length; ++i)
-            addResultToPage(results[i]);
+            InspectorTest.Output.addResult(results[i]);
         resultsSynchronized = true;
-    }
-
-    function clearResults()
-    {
-        InspectorTest.evaluateInPage("clearOutput()");
-    }
-
-    function addResultToPage(text)
-    {
-        InspectorTest.evaluateInPage("output(unescape('" + escape(text) + "'))");
     }
 }