Changeset 245909 in webkit

Timestamp:

May 30, 2019, 4:15:09 PM (7 years ago)

Author:

Devin Rousso

Message:

Web Inspector: Audit: tests are unable to get the current Audit version
​https://bugs.webkit.org/show_bug.cgi?id=198270

Reviewed by Timothy Hatcher.

Source/JavaScriptCore:

Expose the Audit version number through the WebInspectorObject that's injected into tests
so that they can decide at runtime whether they're supported (e.g. the unsupported result).

• inspector/agents/InspectorAuditAgent.h:
• inspector/agents/InspectorAuditAgent.cpp:

(Inspector::InspectorAuditAgent::populateAuditObject):

LayoutTests:

• inspector/audit/run.html:
• inspector/audit/run-expected.txt:
• inspector/audit/version.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/audit/run-expected.txt (modified) (1 diff)
• LayoutTests/inspector/audit/run.html (modified) (1 diff)
• LayoutTests/inspector/audit/version.html (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/inspector/agents/InspectorAuditAgent.cpp (modified) (1 diff)
• Source/JavaScriptCore/inspector/agents/InspectorAuditAgent.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-05-30  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Audit: tests are unable to get the current Audit version
+        https://bugs.webkit.org/show_bug.cgi?id=198270
+
+        Reviewed by Timothy Hatcher.
+
+        * inspector/audit/run.html:
+        * inspector/audit/run-expected.txt:
+        * inspector/audit/version.html:
+
 2019-05-30  Justin Fan  <justin_fan@apple.com>
 

trunk/LayoutTests/inspector/audit/run-expected.txt

@@ -39 +39 @@
 Audit teardown...
 
+-- Running test case: Audit.run.Valid.InjectedObject.Resources
+Audit setup...
+Audit run "function() { return WebInspectorAudit.Resources; }"...
+PASS: The injected WebInspectorAudit should hold an instance of InspectorAuditResourcesObject.
+Audit teardown...
+
+-- Running test case: Audit.run.Valid.InjectedObject.Version
+Audit setup...
+Audit run "function() { return WebInspectorAudit.Version; }"...
+PASS: The injected WebInspectorAudit should hold the current Audit::Version.
+Audit teardown...
+
 -- Running test case: Audit.run.Invalid
 TypeError: eval(`(42)`) is not a function. (In 'eval(`(42)`)(WebInspectorAudit)', 'eval(`(42)`)' is 42)

trunk/LayoutTests/inspector/audit/run.html

@@ -93 +93 @@
 
     suite.addTestCase({
+        name: "Audit.run.Valid.InjectedObject.Resources",
+        description: "Check that the injected object holds an instance of InspectorAuditResourcesObject.",
+        async test() {
+            await InspectorTest.Audit.setupAudit();
+            await auditRun(`function() { return WebInspectorAudit.Resources; }`, (result) => {
+                InspectorTest.expectEqual(result.description, "InspectorAuditResourcesObject", "The injected WebInspectorAudit should hold an instance of InspectorAuditResourcesObject.");
+            });
+            await InspectorTest.Audit.teardownAudit();
+        },
+    });
+
+    suite.addTestCase({
+        name: "Audit.run.Valid.InjectedObject.Version",
+        description: "Check that the injected object holds the current Audit::VERSION value.",
+        async test() {
+            await InspectorTest.Audit.setupAudit();
+            await auditRun(`function() { return WebInspectorAudit.Version; }`, (result) => {
+                InspectorTest.expectEqual(result.value, InspectorBackend.domains.Audit.VERSION, "The injected WebInspectorAudit should hold the current Audit::Version.");
+            });
+            await InspectorTest.Audit.teardownAudit();
+        },
+    });
+
+    suite.addTestCase({
         name: "Audit.run.Invalid",
         description: "Check that an error is thrown when trying to execute a non-function.",

trunk/LayoutTests/inspector/audit/version.html

@@ -12 +12 @@
         description: "Check that the audit system version is in sync with the frontend version.",
         test() {
-            InspectorTest.expectEqual(AuditAgent.VERSION, WI.AuditTestBase.Version, "The audit system version should match the frontend version.");
+            InspectorTest.expectEqual(InspectorBackend.domains.Audit.VERSION, WI.AuditTestBase.Version, "The audit system version should match the frontend version.");
             return true;
         },

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-05-30  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Audit: tests are unable to get the current Audit version
+        https://bugs.webkit.org/show_bug.cgi?id=198270
+
+        Reviewed by Timothy Hatcher.
+
+        Expose the Audit version number through the `WebInspectorObject` that's injected into tests
+        so that they can decide at runtime whether they're supported (e.g. the `unsupported` result).
+
+        * inspector/agents/InspectorAuditAgent.h:
+        * inspector/agents/InspectorAuditAgent.cpp:
+        (Inspector::InspectorAuditAgent::populateAuditObject):
+
 2019-05-30  Tadeu Zagallo  <tzagallo@apple.com> and Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/Source/JavaScriptCore/inspector/agents/InspectorAuditAgent.cpp

@@ -131 +131 @@
 }
 
+void InspectorAuditAgent::populateAuditObject(JSC::ExecState* execState, JSC::Strong<JSC::JSObject>& auditObject)
+{
+    ASSERT(execState);
+    if (!execState)
+        return;
+
+    JSC::JSLockHolder lock(execState);
+
+    auditObject->putDirect(execState->vm(), JSC::Identifier::fromString(execState, "Version"), JSC::JSValue(Inspector::Protocol::Audit::VERSION));
+}
+
 } // namespace Inspector

trunk/Source/JavaScriptCore/inspector/agents/InspectorAuditAgent.h

@@ -64 +64 @@
     virtual InjectedScript injectedScriptForEval(ErrorString&, const int* executionContextId) = 0;
 
-    virtual void populateAuditObject(JSC::ExecState*, JSC::Strong<JSC::JSObject>& /* auditObject */) { };
+    virtual void populateAuditObject(JSC::ExecState*, JSC::Strong<JSC::JSObject>& auditObject);
 
     virtual void muteConsole() { };