Changeset 206111 in webkit


Ignore:
Timestamp:
Sep 19, 2016 1:41:28 PM (8 years ago)
Author:
commit-queue@webkit.org
Message:

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

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/indexeddb/clearObjectStore.html:
  • inspector/indexeddb/deleteDatabaseNamesWithSpace.html:
  • inspector/indexeddb/requestDatabase.html:
  • inspector/indexeddb/requestDatabaseNames.html:
Location:
trunk/LayoutTests
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r206109 r206111  
     12016-09-19  Devin Rousso  <dcrousso+webkit@gmail.com>
     2
     3        Web Inspector: adopt Object.awaitEvent in LayoutTests/inspector/indexeddb
     4        https://bugs.webkit.org/show_bug.cgi?id=162073
     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/indexeddb/clearObjectStore.html:
     12        * inspector/indexeddb/deleteDatabaseNamesWithSpace.html:
     13        * inspector/indexeddb/requestDatabase.html:
     14        * inspector/indexeddb/requestDatabaseNames.html:
     15
    1162016-09-19  Chris Dumez  <cdumez@apple.com>
    217

  • trunk/LayoutTests/inspector/indexeddb/clearObjectStore.html

    r205086 r206111  
    1212        name: "ClearDatabases",
    1313        description: "Remove any existing IndexedDB databases.",
    14         test: (resolve, reject) => {
     14        test(resolve, reject) {
    1515            // FIXME: Remove any existing IndexedDB databases that might exist to workaround:
    1616            // <https://webkit.org/b/148006> Each test should run with its own clean data store
    … …  
    2424        name: "CreateDatabaseAndClearObjectStore",
    2525        description: "Ensure that clearing an object store clears entries in that object store.",
    26         test: (resolve, reject) => {
     26        test(resolve, reject) {
    2727            InspectorTest.evaluateInPage("createDatabaseWithStores('CompleteDatabase', 1)");
    2828            IndexedDBAgent.requestDatabase(WebInspector.frameResourceManager.mainFrame.securityOrigin, "CompleteDatabase", (error, database) => {
    … …  
    7070    suite.addTestCase({
    7171        name: "NoSuchObjectStore",
    72         test: (resolve, reject) => {
    73             InspectorTest.evaluateInPage("createEmptyDatabase('EmptyDatabase', 1)");
    74             InspectorTest.singleFireEventListener("DatabaseCreated", (event) => {
     72        test(resolve, reject) {
     73            InspectorTest.awaitEvent("DatabaseCreated")
     74            .then((event) => {
    7575                IndexedDBAgent.requestDatabase(WebInspector.frameResourceManager.mainFrame.securityOrigin, "EmptyDatabase", (error, database) => {
    7676                    IndexedDBAgent.clearObjectStore(WebInspector.frameResourceManager.mainFrame.securityOrigin, database.name, "NoSuchObjectStore", (error) => {
    … …  
    8080                });
    8181            });
     82
     83            InspectorTest.evaluateInPage("createEmptyDatabase('EmptyDatabase', 1)");
    8284        }
    8385    });

  • trunk/LayoutTests/inspector/indexeddb/deleteDatabaseNamesWithSpace.html

    r205086 r206111  
    1212        name: "ClearDatabases",
    1313        description: "Remove any existing IndexedDB databases.",
    14         test: (resolve, reject) => {
     14        test(resolve, reject) {
    1515            // FIXME: Remove any existing IndexedDB databases that might exist to workaround:
    1616            // <https://webkit.org/b/148006> Each test should run with its own clean data store
    … …  
    2424        name: "EnsureNoDatabases",
    2525        description: "Ensure no databases exist at the start.",
    26         test: (resolve, reject) => {
     26        test(resolve, reject) {
    2727            IndexedDBAgent.requestDatabaseNames(WebInspector.frameResourceManager.mainFrame.securityOrigin, (error, names) => {
    2828                InspectorTest.expectNoError(error);
    … …  
    3636        name: "CreateDatabaseWithSpacesInName",
    3737        description: "Create a database with spaces in the name.",
    38         test: (resolve, reject) => {
    39             InspectorTest.evaluateInPage("createEmptyDatabase('Database With Space')");
    40             InspectorTest.singleFireEventListener("DatabaseCreated", (event) => {
     38        test(resolve, reject) {
     39            InspectorTest.awaitEvent("DatabaseCreated")
     40            .then((event) => {
    4141                IndexedDBAgent.requestDatabaseNames(WebInspector.frameResourceManager.mainFrame.securityOrigin, (error, names) => {
    4242                    InspectorTest.expectNoError(error);
    … …  
    4444                    InspectorTest.log(JSON.stringify(names));
    4545                    resolve();
    46                 });               
     46                });
    4747            });
     48
     49            InspectorTest.evaluateInPage("createEmptyDatabase('Database With Space')");
    4850        }
    4951    });
    … …  
    5254        name: "DeleteDatabaseWithSpacesInName",
    5355        description: "Delete the database.",
    54         test: (resolve, reject) => {
     56        test(resolve, reject) {
    5557            InspectorTest.evaluateInPage("deleteDatabaseNames(['Database With Space'])");
    5658            IndexedDBAgent.requestDatabaseNames(WebInspector.frameResourceManager.mainFrame.securityOrigin, (error, names) => {

  • trunk/LayoutTests/inspector/indexeddb/requestDatabase.html

    r205086 r206111  
    1212        name: "ClearDatabases",
    1313        description: "Remove any existing IndexedDB databases.",
    14         test: (resolve, reject) => {
     14        test(resolve, reject) {
    1515            // FIXME: Remove any existing IndexedDB databases that might exist to workaround:
    1616            // <https://webkit.org/b/148006> Each test should run with its own clean data store
    … …  
    2323    suite.addTestCase({
    2424        name: "CreateAndRequestEmptyDatabase",
    25         test: (resolve, reject) => {
    26             InspectorTest.evaluateInPage("createEmptyDatabase('EmptyDatabase', 123)");
    27             InspectorTest.singleFireEventListener("DatabaseCreated", (event) => {
     25        test(resolve, reject) {
     26            InspectorTest.awaitEvent("DatabaseCreated")
     27            .then((event) => {
    2828                IndexedDBAgent.requestDatabase(WebInspector.frameResourceManager.mainFrame.securityOrigin, "EmptyDatabase", (error, databaseWithObjectStores) => {
    2929                    InspectorTest.expectNoError(error);
    … …  
    3434                });
    3535            });
     36
     37            InspectorTest.evaluateInPage("createEmptyDatabase('EmptyDatabase', 123)");
    3638        }
    3739    });
    … …  
    3941    suite.addTestCase({
    4042        name: "CreateAndRequestDatabaseWithStores",
    41         test: (resolve, reject) => {
    42             InspectorTest.evaluateInPage("createDatabaseWithStores('CompleteDatabase', 456)");
    43             InspectorTest.singleFireEventListener("DatabaseCreated", (event) => {
     43        test(resolve, reject) {
     44            InspectorTest.awaitEvent("DatabaseCreated")
     45            .then((event) => {
    4446                IndexedDBAgent.requestDatabase(WebInspector.frameResourceManager.mainFrame.securityOrigin, "CompleteDatabase", (error, databaseWithObjectStores) => {
    4547                    InspectorTest.expectNoError(error);
    … …  
    7274                });
    7375            });
     76
     77            InspectorTest.evaluateInPage("createDatabaseWithStores('CompleteDatabase', 456)");
    7478        }
    7579    });

  • trunk/LayoutTests/inspector/indexeddb/requestDatabaseNames.html

    r205086 r206111  
    1212        name: "ClearDatabases",
    1313        description: "Remove any existing IndexedDB databases.",
    14         test: (resolve, reject) => {
     14        test(resolve, reject) {
    1515            // FIXME: Remove any existing IndexedDB databases that might exist to workaround:
    1616            // <https://webkit.org/b/148006> Each test should run with its own clean data store
    … …  
    2424        name: "EnsureNoDatabases",
    2525        description: "Ensure no databases exist at the start.",
    26         test: (resolve, reject) => {
     26        test(resolve, reject) {
    2727            IndexedDBAgent.requestDatabaseNames(WebInspector.frameResourceManager.mainFrame.securityOrigin, (error, names) => {
    2828                InspectorTest.expectNoError(error);
    … …  
    3636        name: "CreateDatabase1",
    3737        description: "Create a first database.",
    38         test: (resolve, reject) => {
    39             InspectorTest.evaluateInPage("createEmptyDatabase('Database1')");
    40             InspectorTest.singleFireEventListener("DatabaseCreated", (event) => {
     38        test(resolve, reject) {
     39            InspectorTest.awaitEvent("DatabaseCreated")
     40            .then((event) => {
    4141                IndexedDBAgent.requestDatabaseNames(WebInspector.frameResourceManager.mainFrame.securityOrigin, (error, names) => {
    4242                    InspectorTest.expectNoError(error);
    … …  
    4646                });
    4747            });
     48
     49            InspectorTest.evaluateInPage("createEmptyDatabase('Database1')");
    4850        }
    4951    });
    … …  
    5254        name: "CreateDatabase2",
    5355        description: "Create a second database.",
    54         test: (resolve, reject) => {
    55             InspectorTest.evaluateInPage("createEmptyDatabase('Database2')");
    56             InspectorTest.singleFireEventListener("DatabaseCreated", (event) => {
     56        test(resolve, reject) {
     57            InspectorTest.awaitEvent("DatabaseCreated")
     58            .then((event) => {
    5759                IndexedDBAgent.requestDatabaseNames(WebInspector.frameResourceManager.mainFrame.securityOrigin, (error, names) => {
    5860                    InspectorTest.expectNoError(error);
    … …  
    6264                });
    6365            });
     66
     67            InspectorTest.evaluateInPage("createEmptyDatabase('Database2')");
    6468        }
    6569    });
    … …  
    6872        name: "CreateDatabase3",
    6973        description: "Create a third database with a unicode name.",
    70         test: (resolve, reject) => {
    71             InspectorTest.evaluateInPage("createEmptyDatabase('\u124d')");
    72             InspectorTest.singleFireEventListener("DatabaseCreated", (event) => {
     74        test(resolve, reject) {
     75            InspectorTest.awaitEvent("DatabaseCreated")
     76            .then((event) => {
    7377                IndexedDBAgent.requestDatabaseNames(WebInspector.frameResourceManager.mainFrame.securityOrigin, (error, names) => {
    7478                    InspectorTest.expectNoError(error);
    … …  
    7882                });
    7983            });
     84
     85            InspectorTest.evaluateInPage("createEmptyDatabase('\u124d')");
    8086        }
    8187    });
    … …  
    8490        name: "CreateDatabase4",
    8591        description: "Create a fourth database with a unicode name.",
    86         test: (resolve, reject) => {
    87             InspectorTest.evaluateInPage("createEmptyDatabase('\ud800\udf46')");
    88             InspectorTest.singleFireEventListener("DatabaseCreated", (event) => {
     92        test(resolve, reject) {
     93            InspectorTest.awaitEvent("DatabaseCreated")
     94            .then((event) => {
    8995                IndexedDBAgent.requestDatabaseNames(WebInspector.frameResourceManager.mainFrame.securityOrigin, (error, names) => {
    9096                    InspectorTest.expectNoError(error);
    … …  
    94100                });
    95101            });
     102
     103            InspectorTest.evaluateInPage("createEmptyDatabase('\ud800\udf46')");
    96104        }
    97105    });
Note: See TracChangeset for help on using the changeset viewer.