Changeset 206152 in webkit


Ignore:
Timestamp:
Sep 20, 2016 10:28:51 AM (8 years ago)
Author:
commit-queue@webkit.org
Message:

Web Inspector: adopt Object.awaitEvent in LayoutTests/inspector/model
https://bugs.webkit.org/show_bug.cgi?id=162074

Patch by Devin Rousso <Devin Rousso> on 2016-09-20
Reviewed by Brian Burg.

Replace instances of singleFireEventListener with awaitEvent and use promise logic to make
tests more readable.

  • inspector/model/frame-extra-scripts.html:
  • inspector/model/scope-chain-node.html:
  • inspector/model/script-resource-relationship-expected.txt:
  • inspector/model/script-resource-relationship.html:
  • inspector/model/stack-trace.html:
Location:
trunk/LayoutTests
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r206146 r206152  
     12016-09-20  Devin Rousso  <dcrousso+webkit@gmail.com>
     2
     3        Web Inspector: adopt Object.awaitEvent in LayoutTests/inspector/model
     4        https://bugs.webkit.org/show_bug.cgi?id=162074
     5
     6        Reviewed by Brian Burg.
     7
     8        Replace instances of singleFireEventListener with awaitEvent and use promise logic to make
     9        tests more readable.
     10
     11        * inspector/model/frame-extra-scripts.html:
     12        * inspector/model/scope-chain-node.html:
     13        * inspector/model/script-resource-relationship-expected.txt:
     14        * inspector/model/script-resource-relationship.html:
     15        * inspector/model/stack-trace.html:
     16
    1172016-09-20  Jer Noble  <jer.noble@apple.com>
    218
  • trunk/LayoutTests/inspector/model/frame-extra-scripts.html

    r200065 r206152  
    1717        name: "FrameHasNoExtraScriptsYet",
    1818        description: "No extra scripts yet.",
    19         test: (resolve, reject) => {
     19        test(resolve, reject) {
    2020            let mainFrame = WebInspector.frameResourceManager.mainFrame;
    2121            InspectorTest.expectThat(mainFrame.extraScripts.length === 0, "Main frame should have no dynamic scripts.");
     
    2727        name: "AddExtraScript",
    2828        description: "Add extra script.",
    29         test: (resolve, reject) => {           
    30             WebInspector.frameResourceManager.mainFrame.singleFireEventListener(WebInspector.Frame.Event.ExtraScriptAdded, (event) => {
     29        test(resolve, reject) {
     30            WebInspector.frameResourceManager.mainFrame.awaitEvent(WebInspector.Frame.Event.ExtraScriptAdded)
     31            .then((event) => {
    3132                InspectorTest.pass("ExtraScriptAdded event fired.");
    3233                InspectorTest.expectThat(event.data.script.dynamicallyAddedScriptElement, "Script should identify as dynamic.");
    33             });
    3434
    35             InspectorTest.evaluateInPage("triggerAddScriptElement()", () => {
    3635                let mainFrame = WebInspector.frameResourceManager.mainFrame;
    3736                InspectorTest.expectThat(mainFrame.extraScripts.length === 1, "Main frame should have 1 dynamic script.");
    38                 resolve();
    39             });
     37            })
     38            .then(resolve, reject);
     39
     40            InspectorTest.evaluateInPage("triggerAddScriptElement()");
    4041        }
    4142    });
  • trunk/LayoutTests/inspector/model/scope-chain-node.html

    r202717 r206152  
    2424    }
    2525
    26     function harvestScopeChain(scopeChain) {       
     26    function harvestScopeChain(scopeChain) {
    2727        let promises = [];
    2828        for (let scope of scopeChain) {
     
    4141
    4242    function logScopeChain(scopeChain) {
    43         return harvestScopeChain(scopeChain).then((results) => {
     43        return harvestScopeChain(scopeChain)
     44        .then((results) => {
    4445            InspectorTest.log("SCOPE CHAIN:");
    4546            for (let {scope, propertyDescriptors} of results) {
     
    6061        name: "WebInspector.ScopeChainNode.AllTypes",
    6162        description: "Tests for each of the different scope chain node types.",
    62         test: (resolve, reject) => {
    63             InspectorTest.evaluateInPage("setTimeout(testAllScopes)");
    64             WebInspector.debuggerManager.singleFireEventListener(WebInspector.DebuggerManager.Event.CallFramesDidChange, (event) => {
     63        test(resolve, reject) {
     64            WebInspector.debuggerManager.awaitEvent(WebInspector.DebuggerManager.Event.CallFramesDidChange)
     65            .then((event) => {
    6566                let scopeChain = WebInspector.debuggerManager.activeCallFrame.scopeChain;
    6667                InspectorTest.expectThat(scopeChain.length === 13, "ScopeChain should have 13 scopes.");
    67                 logScopeChain(scopeChain).then((result) => {
    68                     WebInspector.debuggerManager.resume();
    69                     WebInspector.debuggerManager.singleFireEventListener(WebInspector.DebuggerManager.Event.Resumed, (event) => {
    70                         resolve();
    71                     });
    72                 });
    73             });
     68                return logScopeChain(scopeChain);
     69            })
     70            .then((result) => {
     71                let promise = WebInspector.debuggerManager.awaitEvent(WebInspector.DebuggerManager.Event.Resumed);
     72                WebInspector.debuggerManager.resume();
     73                return promise;
     74            })
     75            .then(resolve, reject);
     76
     77            InspectorTest.evaluateInPage("setTimeout(testAllScopes)");
    7478        }
    7579    });
     
    7882        name: "WebInspector.ScopeChainNode.FunctionNameInFunctionExpression",
    7983        description: "Tests that there should be a FunctionName scope inside a function expression.",
    80         test: (resolve, reject) => {
     84        test(resolve, reject) {
     85            WebInspector.debuggerManager.awaitEvent(WebInspector.DebuggerManager.Event.CallFramesDidChange)
     86            .then((event) => {
     87                let scopeChain = WebInspector.debuggerManager.activeCallFrame.scopeChain;
     88                return logScopeChain(scopeChain);
     89            })
     90            .then((result) => {
     91                let promise = WebInspector.debuggerManager.awaitEvent(WebInspector.DebuggerManager.Event.Resumed);
     92                WebInspector.debuggerManager.resume();
     93                return promise;
     94            })
     95            .then(resolve, reject);
     96
    8197            InspectorTest.evaluateInPage("setTimeout(testFunctionNameScope1)");
    82             WebInspector.debuggerManager.singleFireEventListener(WebInspector.DebuggerManager.Event.CallFramesDidChange, (event) => {
    83                 let scopeChain = WebInspector.debuggerManager.activeCallFrame.scopeChain;
    84                 logScopeChain(scopeChain).then((result) => {
    85                     WebInspector.debuggerManager.resume();
    86                     WebInspector.debuggerManager.singleFireEventListener(WebInspector.DebuggerManager.Event.Resumed, (event) => {
    87                         resolve();
    88                     });
    89                 });
    90             });
    9198        }
    9299    });
     
    95102        name: "WebInspector.ScopeChainNode.FunctionNameInClassMethod",
    96103        description: "Tests that there should be a FunctionName scope inside a class method.",
    97         test: (resolve, reject) => {
     104        test(resolve, reject) {
     105            WebInspector.debuggerManager.awaitEvent(WebInspector.DebuggerManager.Event.CallFramesDidChange)
     106            .then((event) => {
     107                let scopeChain = WebInspector.debuggerManager.activeCallFrame.scopeChain;
     108                return logScopeChain(scopeChain);
     109            })
     110            .then((result) => {
     111                let promise = WebInspector.debuggerManager.awaitEvent(WebInspector.DebuggerManager.Event.Resumed);
     112                WebInspector.debuggerManager.resume();
     113                return promise;
     114            })
     115            .then(resolve, reject);
     116
    98117            InspectorTest.evaluateInPage("setTimeout(testFunctionNameScope2)");
    99             WebInspector.debuggerManager.singleFireEventListener(WebInspector.DebuggerManager.Event.CallFramesDidChange, (event) => {
    100                 let scopeChain = WebInspector.debuggerManager.activeCallFrame.scopeChain;
    101                 logScopeChain(scopeChain).then((result) => {
    102                     WebInspector.debuggerManager.resume();
    103                     WebInspector.debuggerManager.singleFireEventListener(WebInspector.DebuggerManager.Event.Resumed, (event) => {
    104                         resolve();
    105                     });
    106                 });
    107             });
    108118        }
    109119    });
     
    112122        name: "WebInspector.ScopeChainNode.BlockScopes",
    113123        description: "Tests for a Block scope inside all the different types of blocks.",
    114         test: (resolve, reject) => {
    115             InspectorTest.evaluateInPage("setTimeout(testBlockScopes)");
    116             WebInspector.debuggerManager.addEventListener(WebInspector.DebuggerManager.Event.ActiveCallFrameDidChange, callFramesDidChangeListener);
    117 
     124        test(resolve, reject) {
    118125            let pauseCount = 0;
    119126            let pauseEventsExpected = 19;
     
    122129                    return;
    123130
    124                 pauseCount++;               
     131                pauseCount++;
    125132                let scopeChain = WebInspector.debuggerManager.activeCallFrame.scopeChain;
    126133
     
    150157                // Print out the full scope of the last few where there are nested or buried block scopes.
    151158                InspectorTest.expectThat(scopeChain.some((scopeChain) => scopeChain.type === WebInspector.ScopeChainNode.Type.Block), `Pause #${pauseCount} - Contains a Block scope.`);
    152                 logScopeChain(scopeChain).then((result) => {
     159
     160                logScopeChain(scopeChain)
     161                .then((result) => {
    153162                    WebInspector.debuggerManager.resume();
    154163                });
    155164            }
     165
     166            WebInspector.debuggerManager.addEventListener(WebInspector.DebuggerManager.Event.ActiveCallFrameDidChange, callFramesDidChangeListener);
     167            InspectorTest.evaluateInPage("setTimeout(testBlockScopes)");
    156168        }
    157169    });
  • trunk/LayoutTests/inspector/model/script-resource-relationship-expected.txt

    r200065 r206152  
    44== Running test suite: WebInspector.Script and WebInspector.Resource relationship
    55-- Running test case: ScriptWithResource
    6 PASS: Resource was added.
    7 PASS: Script was added.
     6PASS: Only one Script should be added.
    87PASS: Resource and Script have the same URL.
    98PASS: Resource should be related to one script.
     
    1312
    1413-- Running test case: NamedScriptWithResource
    15 PASS: Resource was added.
    16 PASS: Script was added.
     14PASS: Only one Script should be added.
    1715PASS: Resource and Script have the same URL.
    1816PASS: Resource should be related to one script.
  • trunk/LayoutTests/inspector/model/script-resource-relationship.html

    r200065 r206152  
    4747        name: "ScriptWithResource",
    4848        description: "Normal relationship between a script and a resource.",
    49         test: (resolve, reject) => {
    50             let script = null, resource = null;
     49        test(resolve, reject) {
     50            let script = null;
     51            let resource = null;
    5152           
    5253            WebInspector.debuggerManager.addEventListener(WebInspector.DebuggerManager.Event.ScriptAdded, scriptListener);
    53             WebInspector.Frame.singleFireEventListener(WebInspector.Frame.Event.ResourceWasAdded, (event) => {
    54                 InspectorTest.pass("Resource was added.");
     54            WebInspector.Frame.awaitEvent(WebInspector.Frame.Event.ResourceWasAdded)
     55            .then((event) => {
    5556                resource = event.data.resource;
     57                validateRelationship();
    5658            });
    5759           
     
    5961                if (!event.data.script.url)
    6062                    return;
    61                 InspectorTest.pass("Script was added.");
     63
     64                InspectorTest.expectThat(!script, "Only one Script should be added.");
     65
    6266                script = event.data.script;
    6367                validateRelationship();
     
    6569
    6670            function validateRelationship() {
     71                if (!resource || !script)
     72                    return;
     73
    6774                validateNormalRelationship(resource, script);
    6875                InspectorTest.expectThat(!script.sourceURL, "Script should not have a sourceURL.");
     
    7986        name: "NamedScriptWithResource",
    8087        description: "Normal relationship between a named script and a resource.",
    81         test: (resolve, reject) => {
    82             let script = null, resource = null;
    83 
    84             WebInspector.debuggerManager.addEventListener(WebInspector.DebuggerManager.Event.ScriptAdded, scriptListener);
    85             WebInspector.Frame.singleFireEventListener(WebInspector.Frame.Event.ResourceWasAdded, (event) => {
    86                 InspectorTest.pass("Resource was added.");
     88        test(resolve, reject) {
     89            let script = null;
     90            let resource = null;
     91
     92            WebInspector.debuggerManager.addEventListener(WebInspector.DebuggerManager.Event.ScriptAdded, scriptListener);
     93            WebInspector.Frame.awaitEvent(WebInspector.Frame.Event.ResourceWasAdded)
     94            .then((event) => {
    8795                resource = event.data.resource;
     96                validateRelationship();
    8897            });
    8998
     
    91100                if (!event.data.script.url)
    92101                    return;
    93                 InspectorTest.pass("Script was added.");
     102
     103                InspectorTest.expectThat(!script, "Only one Script should be added.");
     104
    94105                script = event.data.script;
    95106                validateRelationship();
     
    97108
    98109            function validateRelationship() {
     110                if (!resource || !script)
     111                    return;
     112
    99113                validateNormalRelationship(resource, script);
    100114                InspectorTest.expectThat(script.sourceURL === "foo.js", "Script should have a sourceURL.");
     
    110124        name: "ScriptWithoutResource",
    111125        description: "A named eval does not have a resource.",
    112         test: (resolve, reject) => {
     126        test(resolve, reject) {
    113127            WebInspector.debuggerManager.addEventListener(WebInspector.DebuggerManager.Event.ScriptAdded, scriptListener);
    114128            let resourceListener = WebInspector.Frame.singleFireEventListener(WebInspector.Frame.Event.ResourceWasAdded, (event) => {
     
    139153        name: "DynamicallyAddedScriptElementNoResource",
    140154        description: "A dynamically added script element has no resource.",
    141         test: (resolve, reject) => {
     155        test(resolve, reject) {
    142156            WebInspector.debuggerManager.addEventListener(WebInspector.DebuggerManager.Event.ScriptAdded, scriptListener);
    143157
     
    162176        name: "DocumentWithInlineScripts",
    163177        description: "A document resource may be associated with multiple inline scripts.",
    164         test: (resolve, reject) => {
     178        test(resolve, reject) {
    165179            let mainResource = WebInspector.frameResourceManager.mainFrame.mainResource;
    166180            let scripts = mainResource.scripts.slice().sort((a, b) => a.range.startLine - b.range.startLine);
  • trunk/LayoutTests/inspector/model/stack-trace.html

    r194123 r206152  
    3131        name: "WebInspector.ConsoleMessage.StackTrace",
    3232        description: "Test we can create a StackTrace from console messages (Console.StackTrace).",
    33         test: (resolve, reject) => {
    34             InspectorTest.evaluateInPage("triggerConsoleMessage()");
    35             WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.MessageAdded, function addListener(event) {
     33        test(resolve, reject) {
     34            WebInspector.logManager.awaitEvent(WebInspector.LogManager.Event.MessageAdded)
     35            .then((event) => {
    3636                // Trace message should always have a stack trace.
    3737                let consoleMessage = event.data.message;
     
    4646
    4747                logStackTrace(consoleMessage.stackTrace);
    48                 resolve();
    49             });
     48            })
     49            .then(resolve, reject);
     50
     51            InspectorTest.evaluateInPage("triggerConsoleMessage()");
    5052        }
    5153    });
Note: See TracChangeset for help on using the changeset viewer.