Changeset 206133 in webkit


Ignore:
Timestamp:
Sep 19, 2016 4:51:00 PM (8 years ago)
Author:
commit-queue@webkit.org
Message:

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

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

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

  • inspector/css/createStyleSheet.html:
  • inspector/css/generate-css-rule-string.html:
  • inspector/css/manager-preferredInspectorStyleSheetForFrame-expected.txt:
  • inspector/css/manager-preferredInspectorStyleSheetForFrame.html:
  • inspector/css/stylesheet-events-basic.html:
  • inspector/css/stylesheet-events-inspector-stylesheet.html:
  • inspector/css/stylesheet-events-multiple-documents.html:
Location:
trunk/LayoutTests
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r206131 r206133  
     12016-09-19  Devin Rousso  <dcrousso+webkit@gmail.com>
     2
     3        Web Inspector: adopt Object.awaitEvent in LayoutTests/inspector/css
     4        https://bugs.webkit.org/show_bug.cgi?id=162071
     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/css/createStyleSheet.html:
     12        * inspector/css/generate-css-rule-string.html:
     13        * inspector/css/manager-preferredInspectorStyleSheetForFrame-expected.txt:
     14        * inspector/css/manager-preferredInspectorStyleSheetForFrame.html:
     15        * inspector/css/stylesheet-events-basic.html:
     16        * inspector/css/stylesheet-events-inspector-stylesheet.html:
     17        * inspector/css/stylesheet-events-multiple-documents.html:
     18
    1192016-09-19  Chris Dumez  <cdumez@apple.com>
    220

  • trunk/LayoutTests/inspector/css/createStyleSheet.html

    r189104 r206133  
    1414        name: "CheckNoStyleSheets",
    1515        description: "Ensure there are no stylesheets.",
    16         test: (resolve, reject) => {
     16        test(resolve, reject) {
    1717            InspectorTest.expectThat(WebInspector.cssStyleManager.styleSheets.length === 0, "Should be no stylesheets.");
    1818            resolve();
    … …  
    2424            name: "CreateInspectorStyleSheetCall" + i,
    2525            description: "Should create a new inspector stylesheet.",
    26             test: (resolve, reject) => {
    27                 CSSAgent.createStyleSheet(mainFrame.id);
    28                 WebInspector.cssStyleManager.singleFireEventListener(WebInspector.CSSStyleManager.Event.StyleSheetAdded, function(event) {
     26            test(resolve, reject) {
     27                WebInspector.cssStyleManager.awaitEvent(WebInspector.CSSStyleManager.Event.StyleSheetAdded)
     28                .then((event) => {
    2929                    InspectorTest.expectThat(WebInspector.cssStyleManager.styleSheets.length === i, "Should increase the list of stylesheets.");
    3030                    InspectorTest.expectThat(event.data.styleSheet.origin === WebInspector.CSSStyleSheet.Type.Inspector, "Added StyleSheet origin should be 'inspector'.");
    … …  
    3434                        InspectorTest.expectThat(event.data.styleSheet !== addedStyleSheet, "Added StyleSheet should be different from the last added stylesheet.");
    3535                    addedStyleSheet = event.data.styleSheet;
    36                     resolve();
    37                 });
     36                })
     37                .then(resolve, reject);
     38
     39                CSSAgent.createStyleSheet(mainFrame.id);
    3840            }
    3941        });
    4042    }
    4143
    42     WebInspector.cssStyleManager.singleFireEventListener(WebInspector.CSSStyleManager.Event.StyleSheetRemoved, function(event) {
    43         InspectorTest.assert(false, "Should not be removing any StyleSheets in this test.");
     44    WebInspector.cssStyleManager.awaitEvent(WebInspector.CSSStyleManager.Event.StyleSheetRemoved)
     45    .then((event) => {
     46        InspectorTest.fail("Should not be removing any StyleSheets in this test.");
    4447    });
    4548

  • trunk/LayoutTests/inspector/css/generate-css-rule-string.html

    r190528 r206133  
    2424            name: "InlineStyleString",
    2525            description: "Check the formatting of the generated inline style string.",
    26             test: (resolve, reject) => {
     26            test(resolve, reject) {
    2727                InspectorTest.log(nodeStyles.inlineStyle.generateCSSRuleString());
    2828                resolve();
    … …  
    3535                name: "CSSRuleString" + i,
    3636                description: "Check the formatting of the generated string for the matched CSS rule.",
    37                 test: (resolve, reject) => {
     37                test(resolve, reject) {
    3838                    InspectorTest.log(rule.style.generateCSSRuleString());
    3939                    resolve();
    … …  
    4545    }
    4646
    47     WebInspector.domTreeManager.requestDocument(function(documentNode) {
    48         WebInspector.domTreeManager.querySelector(documentNode.id, "#test-node", function(contentNodeId) {
    49             if (contentNodeId) {
    50                 let domNode = WebInspector.domTreeManager.nodeForId(contentNodeId);
    51                 nodeStyles = WebInspector.cssStyleManager.stylesForNode(domNode);
    52                 if (nodeStyles.needsRefresh)
    53                     nodeStyles.singleFireEventListener(WebInspector.DOMNodeStyles.Event.Refreshed, validateSelectors, this);
    54                 else
    55                     validateSelectors();
    56             } else {
     47    WebInspector.domTreeManager.requestDocument((documentNode) => {
     48        WebInspector.domTreeManager.querySelector(documentNode.id, "#test-node", (contentNodeId) => {
     49            if (!contentNodeId) {
    5750                InspectorTest.log("DOM node not found.");
    5851                InspectorTest.completeTest();
     52                return;
    5953            }
     54
     55            let domNode = WebInspector.domTreeManager.nodeForId(contentNodeId);
     56            nodeStyles = WebInspector.cssStyleManager.stylesForNode(domNode);
     57            if (nodeStyles.needsRefresh) {
     58                nodeStyles.awaitEvent(WebInspector.DOMNodeStyles.Event.Refreshed)
     59                .then(validateSelectors);
     60            } else
     61                validateSelectors();
    6062        });
    6163    });

  • trunk/LayoutTests/inspector/css/manager-preferredInspectorStyleSheetForFrame-expected.txt

    r189104 r206133  
    88
    99-- Running test case: CreateMainFrameInspectorStyleSheet
     10PASS: Should be one stylesheet.
     11PASS: StyleSheet origin is inspector.
     12PASS: StyleSheet.isInspectorStyleSheet() should be true.
    1013PASS: Added StyleSheet origin should be 'inspector'.
    1114PASS: StyleSheet.isInspectorStyleSheet() should be true.
    1215PASS: Added StyleSheet frame should be the main frame.
    13 PASS: Should be one stylesheet.
    14 PASS: StyleSheet origin is inspector.
    15 PASS: StyleSheet.isInspectorStyleSheet() should be true.
    1616
    1717-- Running test case: AnotherMainFrameRequestDoesNothing
    … …  
    2121
    2222-- Running test case: CreateSubFrameInspectorStyleSheet
     23PASS: Should be two stylesheets.
     24PASS: StyleSheet origin should be 'inspector'.
     25PASS: StyleSheet.isInspectorStyleSheet() should be true.
    2326PASS: Added StyleSheet origin should be 'inspector'.
    2427PASS: StyleSheet.isInspectorStyleSheet() should be true.
    2528PASS: Added StyleSheet frame should be a child frame.
    26 PASS: Should be two stylesheets.
    27 PASS: StyleSheet origin should be 'inspector'.
    28 PASS: StyleSheet.isInspectorStyleSheet() should be true.
    2929
    3030-- Running test case: AnotherSubFrameRequestDoesNothing

  • trunk/LayoutTests/inspector/css/manager-preferredInspectorStyleSheetForFrame.html

    r189104 r206133  
    1414        name: "CheckNoStyleSheets",
    1515        description: "Ensure there are no stylesheets.",
    16         test: (resolve, reject) => {
     16        test(resolve, reject) {
    1717            InspectorTest.expectThat(WebInspector.cssStyleManager.styleSheets.length === 0, "Should be no stylesheets.");
    1818            resolve();
    … …  
    2323        name: "CreateMainFrameInspectorStyleSheet",
    2424        description: "First request for main frame should create inspector stylesheet.",
    25         test: (resolve, reject) => {
    26             WebInspector.cssStyleManager.singleFireEventListener(WebInspector.CSSStyleManager.Event.StyleSheetAdded, function(event) {
     25        test(resolve, reject) {
     26            WebInspector.cssStyleManager.awaitEvent(WebInspector.CSSStyleManager.Event.StyleSheetAdded)
     27            .then((event) => {
    2728                InspectorTest.expectThat(event.data.styleSheet.origin === WebInspector.CSSStyleSheet.Type.Inspector, "Added StyleSheet origin should be 'inspector'.");
    2829                InspectorTest.expectThat(event.data.styleSheet.isInspectorStyleSheet(), "StyleSheet.isInspectorStyleSheet() should be true.");
    2930                InspectorTest.expectThat(event.data.styleSheet.parentFrame === mainFrame, "Added StyleSheet frame should be the main frame.");
    3031            });
    31             WebInspector.cssStyleManager.preferredInspectorStyleSheetForFrame(mainFrame, function(styleSheet) {
     32
     33            WebInspector.cssStyleManager.preferredInspectorStyleSheetForFrame(mainFrame, (styleSheet) => {
    3234                InspectorTest.expectThat(WebInspector.cssStyleManager.styleSheets.length === 1, "Should be one stylesheet.");
    3335                InspectorTest.expectThat(styleSheet.origin === WebInspector.CSSStyleSheet.Type.Inspector, "StyleSheet origin is inspector.");
    … …  
    4143        name: "AnotherMainFrameRequestDoesNothing",
    4244        description: "Second request for main frame should not create a new stylesheet.",
    43         test: (resolve, reject) => {
    44             let listener = WebInspector.cssStyleManager.singleFireEventListener(WebInspector.CSSStyleManager.Event.StyleSheetAdded, function(event) {
     45        test(resolve, reject) {
     46            let listener = WebInspector.cssStyleManager.singleFireEventListener(WebInspector.CSSStyleManager.Event.StyleSheetAdded, (event) => {
    4547                InspectorTest.assert(false, "Should not create a new StyleSheet, should reuse the existing one");
    4648            });
    47             WebInspector.cssStyleManager.preferredInspectorStyleSheetForFrame(mainFrame, function(styleSheet) {
     49            WebInspector.cssStyleManager.preferredInspectorStyleSheetForFrame(mainFrame, (styleSheet) => {
    4850                InspectorTest.expectThat(WebInspector.cssStyleManager.styleSheets.length === 1, "Should still be one stylesheet.");
    4951                InspectorTest.expectThat(styleSheet.origin === WebInspector.CSSStyleSheet.Type.Inspector, "StyleSheet origin should be 'inspector'.");
    … …  
    5860        name: "CreateSubFrameInspectorStyleSheet",
    5961        description: "First request for subframe should create inspector stylesheet.",
    60         test: (resolve, reject) => {
    61             WebInspector.cssStyleManager.singleFireEventListener(WebInspector.CSSStyleManager.Event.StyleSheetAdded, function(event) {
     62        test(resolve, reject) {
     63            WebInspector.cssStyleManager.awaitEvent(WebInspector.CSSStyleManager.Event.StyleSheetAdded)
     64            .then((event) => {
    6265                InspectorTest.expectThat(event.data.styleSheet.origin === WebInspector.CSSStyleSheet.Type.Inspector, "Added StyleSheet origin should be 'inspector'.");
    6366                InspectorTest.expectThat(event.data.styleSheet.isInspectorStyleSheet(), "StyleSheet.isInspectorStyleSheet() should be true.");
    6467                InspectorTest.expectThat(event.data.styleSheet.parentFrame === childFrame, "Added StyleSheet frame should be a child frame.");
    6568            });
    66             WebInspector.cssStyleManager.preferredInspectorStyleSheetForFrame(childFrame, function(styleSheet) {
     69
     70            WebInspector.cssStyleManager.preferredInspectorStyleSheetForFrame(childFrame, (styleSheet) => {
    6771                InspectorTest.expectThat(WebInspector.cssStyleManager.styleSheets.length === 2, "Should be two stylesheets.");
    6872                InspectorTest.expectThat(styleSheet.origin === WebInspector.CSSStyleSheet.Type.Inspector, "StyleSheet origin should be 'inspector'.");
    … …  
    7680        name: "AnotherSubFrameRequestDoesNothing",
    7781        description: "Second request for main frame should not create a new stylesheet.",
    78         test: (resolve, reject) => {
    79             let listener = WebInspector.cssStyleManager.singleFireEventListener(WebInspector.CSSStyleManager.Event.StyleSheetAdded, function(event) {
     82        test(resolve, reject) {
     83            let listener = WebInspector.cssStyleManager.singleFireEventListener(WebInspector.CSSStyleManager.Event.StyleSheetAdded, (event) => {
    8084                InspectorTest.assert(false, "Should not create a new StyleSheet, should reuse the existing one");
    8185            });
    82             WebInspector.cssStyleManager.preferredInspectorStyleSheetForFrame(childFrame, function(styleSheet) {
     86            WebInspector.cssStyleManager.preferredInspectorStyleSheetForFrame(childFrame, (styleSheet) => {
    8387                InspectorTest.expectThat(WebInspector.cssStyleManager.styleSheets.length === 2, "Should be two stylesheets.");
    8488                InspectorTest.expectThat(styleSheet.origin === WebInspector.CSSStyleSheet.Type.Inspector, "StyleSheet origin should be 'inspector'.");
    … …  
    9094    });
    9195
    92     WebInspector.cssStyleManager.singleFireEventListener(WebInspector.CSSStyleManager.Event.StyleSheetRemoved, function(event) {
     96    WebInspector.cssStyleManager.awaitEvent(WebInspector.CSSStyleManager.Event.StyleSheetRemoved)
     97    .then((event) => {
    9398        InspectorTest.assert(false, "Should not be removing any StyleSheets in this test.");
    9499    });

  • trunk/LayoutTests/inspector/css/stylesheet-events-basic.html

    r189002 r206133  
    5454        name: "CheckNoStyleSheets",
    5555        description: "Ensure there are currently no stylesheets.",
    56         test: (resolve, reject) => {
     56        test(resolve, reject) {
    5757            InspectorTest.expectThat(WebInspector.cssStyleManager.styleSheets.length === 0, "Should be no stylesheets.");
    5858            resolve();
    … …  
    6767        suite.addTestCase({
    6868            name: `Add${title}`,
    69             test: (resolve, reject) => {
    70                 InspectorTest.evaluateInPage(addExpression);
    71                 WebInspector.cssStyleManager.singleFireEventListener(WebInspector.CSSStyleManager.Event.StyleSheetAdded, function(event) {
     69            test(resolve, reject) {
     70                WebInspector.cssStyleManager.awaitEvent(WebInspector.CSSStyleManager.Event.StyleSheetAdded)
     71                .then((event) => {
    7272                    addedStyleSheet = event.data.styleSheet;
    7373                    InspectorTest.expectThat(addedStyleSheet instanceof WebInspector.CSSStyleSheet, "StyleSheetAdded event should fire.");
    7474                    if (checkStyleSheetRemovedCallback)
    7575                        checkStyleSheetAddedCallback(addedStyleSheet);
    76                     resolve();
    77                 });
     76                })
     77                .then(resolve, reject);
     78
     79                InspectorTest.evaluateInPage(addExpression);
    7880            }
    7981        });
    … …  
    8284            name: `Disable${title}`,
    8385            description: "Disable the newly added stylesheet.",
    84             test: (resolve, reject) => {
    85                 InspectorTest.evaluateInPage("disableStyleSheet()");
    86                 WebInspector.cssStyleManager.singleFireEventListener(WebInspector.CSSStyleManager.Event.StyleSheetRemoved, function(event) {
     86            test(resolve, reject) {
     87                WebInspector.cssStyleManager.awaitEvent(WebInspector.CSSStyleManager.Event.StyleSheetRemoved)
     88                .then((event) => {
    8789                    InspectorTest.assert(event.data.styleSheet instanceof WebInspector.CSSStyleSheet, "Event data should be a CSSStyleSheet");
    8890                    InspectorTest.expectThat(addedStyleSheet === event.data.styleSheet, "StyleSheetRemoved event should fire for the same CSSStyleSheet.");
    89                     resolve();
    90                 });
     91                })
     92                .then(resolve, reject);
     93
     94                InspectorTest.evaluateInPage("disableStyleSheet()");
    9195            }
    9296        });
    … …  
    9599            name: `Enable${title}`,
    96100            description: "Enable the just disabled stylesheet.",
    97             test: (resolve, reject) => {
    98                 InspectorTest.evaluateInPage("enableStyleSheet()");
    99                 WebInspector.cssStyleManager.singleFireEventListener(WebInspector.CSSStyleManager.Event.StyleSheetAdded, function(event) {
     101            test(resolve, reject) {
     102                WebInspector.cssStyleManager.awaitEvent(WebInspector.CSSStyleManager.Event.StyleSheetAdded)
     103                .then((event) => {
    100104                    InspectorTest.assert(event.data.styleSheet instanceof WebInspector.CSSStyleSheet, "Event data should be a CSSStyleSheet");
    101105                    InspectorTest.expectThat(addedStyleSheet !== event.data.styleSheet, "StyleSheetAdded event should fire with a new CSSStyleSheet.");
    102106                    addedStyleSheet = event.data.styleSheet;
    103                     resolve();
    104                 });
     107                })
     108                .then(resolve, reject);
     109
     110                InspectorTest.evaluateInPage("enableStyleSheet()");
    105111            }
    106112        });
    … …  
    112118            suite.addTestCase({
    113119                name: extraDisableTitle,
    114                 test: (resolve, reject) => {
    115                     InspectorTest.evaluateInPage(extraDisableExpression);
    116                     WebInspector.cssStyleManager.singleFireEventListener(WebInspector.CSSStyleManager.Event.StyleSheetRemoved, function(event) {
     120                test(resolve, reject) {
     121                    WebInspector.cssStyleManager.awaitEvent(WebInspector.CSSStyleManager.Event.StyleSheetRemoved)
     122                    .then((event) => {
    117123                        InspectorTest.assert(event.data.styleSheet instanceof WebInspector.CSSStyleSheet, "Event data should be a CSSStyleSheet");
    118124                        InspectorTest.expectThat(addedStyleSheet === event.data.styleSheet, "StyleSheetRemoved event should fire for the same CSSStyleSheet.");
    119                         resolve();
    120                     });
     125                    })
     126                    .then(resolve, reject);
     127
     128                    InspectorTest.evaluateInPage(extraDisableExpression);
    121129                }
    122130            });
    … …  
    124132            suite.addTestCase({
    125133                name: extraEnableTitle,
    126                 test: (resolve, reject) => {
    127                     InspectorTest.evaluateInPage(extraEnableExpression);
    128                     WebInspector.cssStyleManager.singleFireEventListener(WebInspector.CSSStyleManager.Event.StyleSheetAdded, function(event) {
     134                test(resolve, reject) {
     135                    WebInspector.cssStyleManager.awaitEvent(WebInspector.CSSStyleManager.Event.StyleSheetAdded)
     136                    .then((event) => {
    129137                        InspectorTest.assert(event.data.styleSheet instanceof WebInspector.CSSStyleSheet, "Event data should be a CSSStyleSheet");
    130138                        InspectorTest.expectThat(addedStyleSheet !== event.data.styleSheet, "StyleSheetAdded event should fire with a new CSSStyleSheet.");
    131139                        addedStyleSheet = event.data.styleSheet;
    132                         resolve();
    133                     });
     140                    })
     141                    .then(resolve, reject);
     142
     143                    InspectorTest.evaluateInPage(extraEnableExpression);
    134144                }
    135145            });
    … …  
    138148        suite.addTestCase({
    139149            name: `Remove${title}`,
    140             test: (resolve, reject) => {
    141                 InspectorTest.evaluateInPage(removeExpression);
    142                 WebInspector.cssStyleManager.singleFireEventListener(WebInspector.CSSStyleManager.Event.StyleSheetRemoved, function(event) {
     150            test(resolve, reject) {
     151                WebInspector.cssStyleManager.awaitEvent(WebInspector.CSSStyleManager.Event.StyleSheetRemoved)
     152                .then((event) => {
    143153                    InspectorTest.expectThat(event.data.styleSheet instanceof WebInspector.CSSStyleSheet, "StyleSheetAdded event should fire.");
    144154                    if (checkStyleSheetRemovedCallback)
    145155                        checkStyleSheetRemovedCallback(event.data.styleSheet);
    146156                    addedStyleSheet = null;
    147                     resolve();
    148                 });
     157                })
     158                .then(resolve, reject);
     159
     160                InspectorTest.evaluateInPage(removeExpression);
    149161            }
    150162        });

  • trunk/LayoutTests/inspector/css/stylesheet-events-inspector-stylesheet.html

    r189104 r206133  
    1111        name: "CheckNoStyleSheets",
    1212        description: "Ensure there are currently no stylesheets.",
    13         test: (resolve, reject) => {
     13        test(resolve, reject) {
    1414            InspectorTest.expectThat(WebInspector.cssStyleManager.styleSheets.length === 0, "Should be no stylesheets.");
    1515            resolve();
    … …  
    2020        name: "CreateInspectorStyleSheet",
    2121        description: "Creating an inspector stylesheet adds a stylesheet.",
    22         test: (resolve, reject) => {
    23             CSSAgent.createStyleSheet(WebInspector.frameResourceManager.mainFrame.id);
    24             WebInspector.cssStyleManager.singleFireEventListener(WebInspector.CSSStyleManager.Event.StyleSheetAdded, function(event) {
     22        test(resolve, reject) {
     23            WebInspector.cssStyleManager.awaitEvent(WebInspector.CSSStyleManager.Event.StyleSheetAdded)
     24            .then((event) => {
    2525                InspectorTest.expectThat(WebInspector.cssStyleManager.styleSheets.length === 1, "Should be one stylesheet.");
    2626                InspectorTest.assert(event.data.styleSheet instanceof WebInspector.CSSStyleSheet, "Event data should be a CSSStyleSheet");
    2727                InspectorTest.expectThat(event.data.styleSheet.origin === WebInspector.CSSStyleSheet.Type.Inspector, "StyleSheet origin should be 'inspector'.");
    28                 resolve();
    29             });
     28            })
     29            .then(resolve, reject);
     30
     31            CSSAgent.createStyleSheet(WebInspector.frameResourceManager.mainFrame.id);
    3032        }
    3133    });

  • trunk/LayoutTests/inspector/css/stylesheet-events-multiple-documents.html

    r189002 r206133  
    66<script>
    77function addSubframe() {
    8     var iframe = document.createElement("iframe");
     8    let iframe = document.createElement("iframe");
    99    iframe.id = "subframe";
    1010    iframe.src = "resources/stylesheet-events-subframe.html";
    … …  
    2323
    2424    function logStyleSheets() {
    25         WebInspector.cssStyleManager.styleSheets.sort((a, b) => a.url.localeCompare(b.url)).forEach(function(styleSheet) {
    26             var frameString = styleSheet.parentFrame.id === WebInspector.frameResourceManager.mainFrame.id ? "<mainframe>" : "<childframe>";
     25        WebInspector.cssStyleManager.styleSheets.sort((a, b) => a.url.localeCompare(b.url)).forEach((styleSheet) => {
     26            let frameString = styleSheet.parentFrame.id === WebInspector.frameResourceManager.mainFrame.id ? "<mainframe>" : "<childframe>";
    2727            InspectorTest.log(`URL: ${sanitizeURL(styleSheet.url)} ${frameString}`);
    2828        });
    … …  
    3434        name: "CheckStyleSheets",
    3535        description: "Ensure there is currently one stylesheet.",
    36         test: (resolve, reject) => {
     36        test(resolve, reject) {
    3737            InspectorTest.expectThat(WebInspector.cssStyleManager.styleSheets.length === 1, "Should be one stylesheets.");
    3838            logStyleSheets();
    … …  
    4444        name: "CheckStyleSheetsAfterAddingSubframe",
    4545        description: "Ensure subframe stylesheets are added.",
    46         test: (resolve, reject) => {
    47             InspectorTest.evaluateInPage("addSubframe()");
    48             WebInspector.cssStyleManager.singleFireEventListener(WebInspector.CSSStyleManager.Event.StyleSheetAdded, function(event) {
     46        test(resolve, reject) {
     47            WebInspector.cssStyleManager.awaitEvent(WebInspector.CSSStyleManager.Event.StyleSheetAdded)
     48            .then((event) => {
    4949                InspectorTest.expectThat(WebInspector.cssStyleManager.styleSheets.length === 2, "Should be two stylesheets.");
    5050                InspectorTest.expectThat(event.data.styleSheet.parentFrame !== WebInspector.frameResourceManager.mainFrame.id, "New StyleSheet is for a subframe");
    5151                logStyleSheets();
    52                 resolve();
    53             });
     52            })
     53            .then(resolve, reject);
     54
     55            InspectorTest.evaluateInPage("addSubframe()");
    5456        }
    5557    });
    … …  
    5860        name: "CheckStyleSheetsAfterRemovingSubframe",
    5961        description: "Ensure subframe stylesheets are removed.",
    60         test: (resolve, reject) => {
    61             InspectorTest.evaluateInPage("removeSubframe()");
    62             WebInspector.cssStyleManager.singleFireEventListener(WebInspector.CSSStyleManager.Event.StyleSheetRemoved, function(event) {
     62        test(resolve, reject) {
     63            WebInspector.cssStyleManager.awaitEvent(WebInspector.CSSStyleManager.Event.StyleSheetRemoved)
     64            .then((event) => {
    6365                InspectorTest.expectThat(WebInspector.cssStyleManager.styleSheets.length === 1, "Should be one stylesheet.");
    6466                InspectorTest.expectThat(event.data.styleSheet.parentFrame !== WebInspector.frameResourceManager.mainFrame.id, "Removed StyleSheet is for a subframe");
    6567                logStyleSheets();
    66                 resolve();
    67             });
     68            })
     69            .then(resolve, reject);
     70
     71            InspectorTest.evaluateInPage("removeSubframe()");
    6872        }
    6973    });
Note: See TracChangeset for help on using the changeset viewer.