Changeset 157938 in webkit

Timestamp:

Oct 24, 2013 10:08:23 AM (10 years ago)

Author:

Alexandru Chiculita

Message:

Web Inspector: Add a way to test the Manager and model classes
​https://bugs.webkit.org/show_bug.cgi?id=123223

Reviewed by Timothy Hatcher.

Source/WebInspectorUI:

Moved some global functions out of Main.js, so that they can be used in the
layout tests without including Main.js.

• UserInterface/Main.html: Referenced the new JS files.
• UserInterface/Main.js:
• UserInterface/MessageDispatcher.js: Added.

(WebInspector.dispatchNextQueuedMessageFromBackend):
(WebInspector.dispatchMessageFromBackend):

• UserInterface/URLUtilities.js: Added.

(removeURLFragment):
(relativePath):
(parseURL):
(absoluteURL):
(parseLocationQueryParameters):
(parseQueryString):
(WebInspector.displayNameForURL):
(WebInspector.displayNameForHost):

• UserInterface/Utilities.js:

LayoutTests:

Added the first new WebInspector layout test file. The test is using InspectorTest.importInspectorScripts
to bootstrap some of the managers/observers/models from the new WebInspector.

• http/tests/inspector-protocol/resources/InspectorTest.js:

(InspectorTest.importScript):
(InspectorTest.importInspectorScripts):

• inspector-protocol/model/main-frame-resource-expected.txt: Added.
• inspector-protocol/model/main-frame-resource.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/inspector-protocol/resources/InspectorTest.js (modified) (1 diff)
• LayoutTests/inspector-protocol/model (added)
• LayoutTests/inspector-protocol/model/main-frame-resource-expected.txt (added)
• LayoutTests/inspector-protocol/model/main-frame-resource.html (added)
• Source/WebInspectorUI/ChangeLog (modified) (1 diff)
• Source/WebInspectorUI/UserInterface/Main.html (modified) (1 diff)
• Source/WebInspectorUI/UserInterface/Main.js (modified) (2 diffs)
• Source/WebInspectorUI/UserInterface/MessageDispatcher.js (added)
• Source/WebInspectorUI/UserInterface/URLUtilities.js (added)
• Source/WebInspectorUI/UserInterface/Utilities.js (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-10-24  Alexandru Chiculita  <achicu@adobe.com>
+
+        Web Inspector: Add a way to test the Manager and model classes
+        https://bugs.webkit.org/show_bug.cgi?id=123223
+
+        Reviewed by Timothy Hatcher.
+
+        Added the first new WebInspector layout test file. The test is using InspectorTest.importInspectorScripts
+        to bootstrap some of the managers/observers/models from the new WebInspector.
+
+        * http/tests/inspector-protocol/resources/InspectorTest.js:
+        (InspectorTest.importScript):
+        (InspectorTest.importInspectorScripts):
+        * inspector-protocol/model/main-frame-resource-expected.txt: Added.
+        * inspector-protocol/model/main-frame-resource.html: Added.
+
 2013-10-24  Alexey Proskuryakov  <ap@apple.com>
 

trunk/LayoutTests/http/tests/inspector-protocol/resources/InspectorTest.js

@@ -107 +107 @@
     xhr.open("GET", scriptName, false);
     xhr.send(null);
-    window.eval(xhr.responseText);
+    if (xhr.status !== 0 && xhr.status !== 200)
+        throw new Error("Invalid script URL: " + scriptName);
+    var script = "try { " + xhr.responseText + "} catch (e) { alert(" + JSON.stringify("Error in: " + scriptName) + "); throw e; }";
+    window.eval(script);
 }
+
+InspectorTest.importInspectorScripts = function()
+{
+    // Note: This function overwrites the InspectorFrontendAPI, so there's currently no
+    // way to intercept the messages from the backend.
+
+    var inspectorScripts = [
+        "Utilities",
+        "WebInspector",
+        "Object",
+        "InspectorBackend",
+        "InspectorFrontendAPI",
+        "InspectorFrontendHostStub",
+        "InspectorBackendCommands",
+        "URLUtilities",
+        "MessageDispatcher",
+        "Setting",
+        "PageObserver",
+        "DOMObserver",
+        "FrameResourceManager",
+        "RuntimeManager",
+        "Frame",
+        "Revision",
+        "SourceCodeRevision",
+        "SourceCode",
+        "Resource",
+        "ResourceCollection",
+        "DOMTreeManager",
+        "DOMNode",
+        "ContentFlow",
+        "DOMTree",
+        "ExecutionContext",
+        "ExecutionContextList"
+    ];
+    for (var i = 0; i < inspectorScripts.length; ++i)
+        InspectorTest.importScript("../../../../../Source/WebInspectorUI/UserInterface/" + inspectorScripts[i] + ".js");
+
+    // The initialization should be in sync with WebInspector.loaded in Main.js.
+    // FIXME: As soon as we can support all the observers and managers we should remove UI related tasks 
+    // from WebInspector.loaded, so that it can be used from the LayoutTests.
+
+    InspectorBackend.registerPageDispatcher(new WebInspector.PageObserver);
+    InspectorBackend.registerDOMDispatcher(new WebInspector.DOMObserver);
+
+    WebInspector.frameResourceManager = new WebInspector.FrameResourceManager;
+    WebInspector.domTreeManager = new WebInspector.DOMTreeManager;
+
+    InspectorFrontendHost.loaded();
+}
+
 
 window.addEventListener("message", function(event) {

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2013-10-24  Alexandru Chiculita  <achicu@adobe.com>
+
+        Web Inspector: Add a way to test the Manager and model classes
+        https://bugs.webkit.org/show_bug.cgi?id=123223
+
+        Reviewed by Timothy Hatcher.
+
+        Moved some global functions out of Main.js, so that they can be used in the 
+        layout tests without including Main.js.
+
+        * UserInterface/Main.html: Referenced the new JS files.
+        * UserInterface/Main.js:
+        * UserInterface/MessageDispatcher.js: Added.
+        (WebInspector.dispatchNextQueuedMessageFromBackend):
+        (WebInspector.dispatchMessageFromBackend):
+        * UserInterface/URLUtilities.js: Added.
+        (removeURLFragment):
+        (relativePath):
+        (parseURL):
+        (absoluteURL):
+        (parseLocationQueryParameters):
+        (parseQueryString):
+        (WebInspector.displayNameForURL):
+        (WebInspector.displayNameForHost):
+        * UserInterface/Utilities.js:
+
 2013-10-21  Alexandru Chiculita  <achicu@adobe.com>
 

trunk/Source/WebInspectorUI/UserInterface/Main.html

@@ -144 +144 @@
     <script src="Utilities.js"></script>
     <script src="WebInspector.js"></script>
+    <script src="URLUtilities.js"></script>
+    <script src="MessageDispatcher.js"></script>
     <script src="Object.js"></script>
     <script src="CodeMirrorDragToAlterNumberController.js"></script>

trunk/Source/WebInspectorUI/UserInterface/Main.js

@@ -312 +312 @@
 }
 
-WebInspector.messagesToDispatch = [];
-
-WebInspector.dispatchNextQueuedMessageFromBackend = function()
-{
-    for (var i = 0; i < this.messagesToDispatch.length; ++i)
-        InspectorBackend.dispatch(this.messagesToDispatch[i]);
-
-    this.messagesToDispatch = [];
-
-    this._dispatchTimeout = null;
-}
-
-WebInspector.dispatchMessageFromBackend = function(message)
-{
-    // Enforce asynchronous interaction between the backend and the frontend by queueing messages.
-    // The messages are dequeued on a zero delay timeout.
-
-    this.messagesToDispatch.push(message);
-
-    if (this._dispatchTimeout)
-        return;
-
-    this._dispatchTimeout = setTimeout(this.dispatchNextQueuedMessageFromBackend.bind(this), 0);
-}
-
 WebInspector.sidebarPanelForCurrentContentView = function()
 {
@@ -377 +352 @@
         return sidebarPanel.treeElementForRepresentedObject(representedObject);
     return null;
-}
-
-WebInspector.displayNameForURL = function(url, urlComponents)
-{
-    if (!urlComponents)
-        urlComponents = parseURL(url);
-
-    var displayName;
-    try {
-        displayName = decodeURIComponent(urlComponents.lastPathComponent || "");
-    } catch (e) {
-        displayName = urlComponents.lastPathComponent;
-    }
-
-    return displayName || WebInspector.displayNameForHost(urlComponents.host) || url;
-}
-
-WebInspector.displayNameForHost = function(host)
-{
-    // FIXME <rdar://problem/11237413>: This should decode punycode hostnames.
-    return host;
 }
 

trunk/Source/WebInspectorUI/UserInterface/Utilities.js

@@ -982 +982 @@
 }
 
-function removeURLFragment(url)
-{
-    var hashIndex = url.indexOf("#");
-    if (hashIndex >= 0)
-        return url.substring(0, hashIndex);
-    return url;
-}
-
-function relativePath(path, basePath)
-{
-    console.assert(path.charAt(0) === "/");
-    console.assert(basePath.charAt(0) === "/");
-    
-    var pathComponents = path.split("/");
-    var baseComponents = basePath.replace(/\/$/, "").split("/");
-    var finalComponents = [];
-
-    var index = 1;
-    for (; index < pathComponents.length && index < baseComponents.length; ++index) {
-        if (pathComponents[index] !== baseComponents[index])
-            break;
-    }
-
-    for (var i = index; i < baseComponents.length; ++i)
-        finalComponents.push("..");
-
-    for (var i = index; i < pathComponents.length; ++i)
-        finalComponents.push(pathComponents[i]);
-
-    return finalComponents.join("/");
-}
-
 function resolveDotsInPath(path)
 {
@@ -1048 +1016 @@
 }
 
-function parseURL(url)
-{
-    url = url ? url.trim() : "";
-
-    var match = url.match(/^([^:]+):\/\/([^\/:]*)(?::([\d]+))?(?:(\/[^#]*)(?:#(.*))?)?$/i);
-    if (!match)
-        return {scheme: null, host: null, port: null, path: null, queryString: null, fragment: null, lastPathComponent: null};
-
-    var scheme = match[1].toLowerCase();
-    var host = match[2].toLowerCase();
-    var port = Number(match[3]) || null;
-    var wholePath = match[4] || null;
-    var fragment = match[5] || null;
-    var path = wholePath;
-    var queryString = null;
-
-    // Split the path and the query string.
-    if (wholePath) {
-        var indexOfQuery = wholePath.indexOf("?");
-        if (indexOfQuery !== -1) {
-            path = wholePath.substring(0, indexOfQuery);
-            queryString = wholePath.substring(indexOfQuery + 1);
-        }
-        path = resolveDotsInPath(path);
-    }
-
-    // Find last path component.
-    var lastPathComponent = null;
-    if (path && path !== "/") {
-        // Skip the trailing slash if there is one.
-        var endOffset = path[path.length - 1] === "/" ? 1 : 0;
-        var lastSlashIndex = path.lastIndexOf("/", path.length - 1 - endOffset);
-        if (lastSlashIndex !== -1)
-            lastPathComponent = path.substring(lastSlashIndex + 1, path.length - endOffset);
-    }
-
-    return {scheme: scheme, host: host, port: port, path: path, queryString: queryString, fragment: fragment, lastPathComponent: lastPathComponent};
-}
-
-function absoluteURL(partialURL, baseURL)
-{
-    partialURL = partialURL ? partialURL.trim() : "";
-
-    // Return data and javascript URLs as-is.
-    if (partialURL.startsWith("data:") || partialURL.startsWith("javascript:") || partialURL.startsWith("mailto:"))
-        return partialURL;
-
-    // If the URL has a scheme it is already a full URL, so return it.
-    if (parseURL(partialURL).scheme)
-        return partialURL;
-
-    // If there is no partial URL, just return the base URL.
-    if (!partialURL)
-        return baseURL || null;
-
-    var baseURLComponents = parseURL(baseURL);
-
-    // The base URL needs to be an absolute URL. Return null if it isn't.
-    if (!baseURLComponents.scheme)
-        return null;
-
-    // A URL that starts with "//" is a full URL without the scheme. Use the base URL scheme.
-    if (partialURL[0] === "/" && partialURL[1] === "/")
-        return baseURLComponents.scheme + ":" + partialURL;
-
-    // The path can be null for URLs that have just a scheme and host (like "http://apple.com"). So make the path be "/".
-    if (!baseURLComponents.path)
-        baseURLComponents.path = "/";
-
-    // Generate the base URL prefix that is used in the rest of the cases.
-    var baseURLPrefix = baseURLComponents.scheme + "://" + baseURLComponents.host + (baseURLComponents.port ? (":" + baseURLComponents.port) : "");
-
-    // A URL that starts with "?" is just a query string that gets applied to the base URL (replacing the base URL query string and fragment).
-    if (partialURL[0] === "?")
-        return baseURLPrefix + baseURLComponents.path + partialURL;
-
-    // A URL that starts with "/" is an absolute path that gets applied to the base URL (replacing the base URL path, query string and fragment).
-    if (partialURL[0] === "/")
-        return baseURLPrefix + resolveDotsInPath(partialURL);
-
-    // Generate the base path that is used in the final case by removing everything after the last "/" from the base URL's path.
-    var basePath = baseURLComponents.path.substring(0, baseURLComponents.path.lastIndexOf("/")) + "/";
-    return baseURLPrefix + resolveDotsInPath(basePath + partialURL);
-}
-
 function parseMIMEType(fullMimeType)
 {
@@ -1191 +1074 @@
     return new RegExp(regexString, regExpFlags);
 }
-
-function parseLocationQueryParameters(arrayResult)
-{
-    // The first character is always the "?".
-    return parseQueryString(window.location.search.substring(1), arrayResult);
-}
-
-function parseQueryString(queryString, arrayResult)
-{
-    if (!queryString)
-        return arrayResult ? [] : {};
-
-    function decode(string)
-    {
-        try {
-            // Replace "+" with " " then decode precent encoded values.
-            return decodeURIComponent(string.replace(/\+/g, " "));
-        } catch (e) {
-            return string;
-        }
-    }
-
-    var parameters = arrayResult ? [] : {};
-    var parameterStrings = queryString.split("&");
-    for (var i = 0; i < parameterStrings.length; ++i) {
-        var pair = parameterStrings[i].split("=").map(decode);
-        if (arrayResult)
-            parameters.push({name: pair[0], value: pair[1]});
-        else
-            parameters[pair[0]] = pair[1];
-    }
-
-    return parameters;
-}