Diff
Modified: trunk/LayoutTests/ChangeLog (206110 => 206111)
--- trunk/LayoutTests/ChangeLog 2016-09-19 20:39:55 UTC (rev 206110)
+++ trunk/LayoutTests/ChangeLog 2016-09-19 20:41:28 UTC (rev 206111)
@@ -1,3 +1,18 @@
+2016-09-19 Devin Rousso <dcrousso+web...@gmail.com>
+
+ Web Inspector: adopt Object.awaitEvent in LayoutTests/inspector/indexeddb
+ https://bugs.webkit.org/show_bug.cgi?id=162073
+
+ 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:
+
2016-09-19 Chris Dumez <cdu...@apple.com>
Window's pageXOffset / pageYOffset attributes should be replaceable
Modified: trunk/LayoutTests/inspector/indexeddb/clearObjectStore.html (206110 => 206111)
--- trunk/LayoutTests/inspector/indexeddb/clearObjectStore.html 2016-09-19 20:39:55 UTC (rev 206110)
+++ trunk/LayoutTests/inspector/indexeddb/clearObjectStore.html 2016-09-19 20:41:28 UTC (rev 206111)
@@ -11,7 +11,7 @@
suite.addTestCase({
name: "ClearDatabases",
description: "Remove any existing IndexedDB databases.",
- test: (resolve, reject) => {
+ test(resolve, reject) {
// FIXME: Remove any existing IndexedDB databases that might exist to workaround:
// <https://webkit.org/b/148006> Each test should run with its own clean data store
IndexedDBAgent.requestDatabaseNames(WebInspector.frameResourceManager.mainFrame.securityOrigin, (error, names) => {
@@ -23,7 +23,7 @@
suite.addTestCase({
name: "CreateDatabaseAndClearObjectStore",
description: "Ensure that clearing an object store clears entries in that object store.",
- test: (resolve, reject) => {
+ test(resolve, reject) {
InspectorTest.evaluateInPage("createDatabaseWithStores('CompleteDatabase', 1)");
IndexedDBAgent.requestDatabase(WebInspector.frameResourceManager.mainFrame.securityOrigin, "CompleteDatabase", (error, database) => {
InspectorTest.expectNoError(error);
@@ -69,9 +69,9 @@
suite.addTestCase({
name: "NoSuchObjectStore",
- test: (resolve, reject) => {
- InspectorTest.evaluateInPage("createEmptyDatabase('EmptyDatabase', 1)");
- InspectorTest.singleFireEventListener("DatabaseCreated", (event) => {
+ test(resolve, reject) {
+ InspectorTest.awaitEvent("DatabaseCreated")
+ .then((event) => {
IndexedDBAgent.requestDatabase(WebInspector.frameResourceManager.mainFrame.securityOrigin, "EmptyDatabase", (error, database) => {
IndexedDBAgent.clearObjectStore(WebInspector.frameResourceManager.mainFrame.securityOrigin, database.name, "NoSuchObjectStore", (error) => {
InspectorTest.expectThat(error, "Should be an error attempting to clear an object store that does not exist.");
@@ -79,6 +79,8 @@
});
});
});
+
+ InspectorTest.evaluateInPage("createEmptyDatabase('EmptyDatabase', 1)");
}
});
Modified: trunk/LayoutTests/inspector/indexeddb/deleteDatabaseNamesWithSpace.html (206110 => 206111)
--- trunk/LayoutTests/inspector/indexeddb/deleteDatabaseNamesWithSpace.html 2016-09-19 20:39:55 UTC (rev 206110)
+++ trunk/LayoutTests/inspector/indexeddb/deleteDatabaseNamesWithSpace.html 2016-09-19 20:41:28 UTC (rev 206111)
@@ -11,7 +11,7 @@
suite.addTestCase({
name: "ClearDatabases",
description: "Remove any existing IndexedDB databases.",
- test: (resolve, reject) => {
+ test(resolve, reject) {
// FIXME: Remove any existing IndexedDB databases that might exist to workaround:
// <https://webkit.org/b/148006> Each test should run with its own clean data store
IndexedDBAgent.requestDatabaseNames(WebInspector.frameResourceManager.mainFrame.securityOrigin, (error, names) => {
@@ -23,7 +23,7 @@
suite.addTestCase({
name: "EnsureNoDatabases",
description: "Ensure no databases exist at the start.",
- test: (resolve, reject) => {
+ test(resolve, reject) {
IndexedDBAgent.requestDatabaseNames(WebInspector.frameResourceManager.mainFrame.securityOrigin, (error, names) => {
InspectorTest.expectNoError(error);
InspectorTest.expectThat(names.length === 0, "No IndexedDB databases should exist initially.");
@@ -35,16 +35,18 @@
suite.addTestCase({
name: "CreateDatabaseWithSpacesInName",
description: "Create a database with spaces in the name.",
- test: (resolve, reject) => {
- InspectorTest.evaluateInPage("createEmptyDatabase('Database With Space')");
- InspectorTest.singleFireEventListener("DatabaseCreated", (event) => {
+ test(resolve, reject) {
+ InspectorTest.awaitEvent("DatabaseCreated")
+ .then((event) => {
IndexedDBAgent.requestDatabaseNames(WebInspector.frameResourceManager.mainFrame.securityOrigin, (error, names) => {
InspectorTest.expectNoError(error);
InspectorTest.expectThat(names.length === 1, "A single IndexedDB database should exist.");
InspectorTest.log(JSON.stringify(names));
resolve();
- });
+ });
});
+
+ InspectorTest.evaluateInPage("createEmptyDatabase('Database With Space')");
}
});
@@ -51,7 +53,7 @@
suite.addTestCase({
name: "DeleteDatabaseWithSpacesInName",
description: "Delete the database.",
- test: (resolve, reject) => {
+ test(resolve, reject) {
InspectorTest.evaluateInPage("deleteDatabaseNames(['Database With Space'])");
IndexedDBAgent.requestDatabaseNames(WebInspector.frameResourceManager.mainFrame.securityOrigin, (error, names) => {
InspectorTest.expectNoError(error);
Modified: trunk/LayoutTests/inspector/indexeddb/requestDatabase.html (206110 => 206111)
--- trunk/LayoutTests/inspector/indexeddb/requestDatabase.html 2016-09-19 20:39:55 UTC (rev 206110)
+++ trunk/LayoutTests/inspector/indexeddb/requestDatabase.html 2016-09-19 20:41:28 UTC (rev 206111)
@@ -11,7 +11,7 @@
suite.addTestCase({
name: "ClearDatabases",
description: "Remove any existing IndexedDB databases.",
- test: (resolve, reject) => {
+ test(resolve, reject) {
// FIXME: Remove any existing IndexedDB databases that might exist to workaround:
// <https://webkit.org/b/148006> Each test should run with its own clean data store
IndexedDBAgent.requestDatabaseNames(WebInspector.frameResourceManager.mainFrame.securityOrigin, (error, names) => {
@@ -22,9 +22,9 @@
suite.addTestCase({
name: "CreateAndRequestEmptyDatabase",
- test: (resolve, reject) => {
- InspectorTest.evaluateInPage("createEmptyDatabase('EmptyDatabase', 123)");
- InspectorTest.singleFireEventListener("DatabaseCreated", (event) => {
+ test(resolve, reject) {
+ InspectorTest.awaitEvent("DatabaseCreated")
+ .then((event) => {
IndexedDBAgent.requestDatabase(WebInspector.frameResourceManager.mainFrame.securityOrigin, "EmptyDatabase", (error, databaseWithObjectStores) => {
InspectorTest.expectNoError(error);
InspectorTest.expectThat(databaseWithObjectStores.name === "EmptyDatabase", "Database name should be 'EmptyDatabase'.");
@@ -33,14 +33,16 @@
resolve();
});
});
+
+ InspectorTest.evaluateInPage("createEmptyDatabase('EmptyDatabase', 123)");
}
});
suite.addTestCase({
name: "CreateAndRequestDatabaseWithStores",
- test: (resolve, reject) => {
- InspectorTest.evaluateInPage("createDatabaseWithStores('CompleteDatabase', 456)");
- InspectorTest.singleFireEventListener("DatabaseCreated", (event) => {
+ test(resolve, reject) {
+ InspectorTest.awaitEvent("DatabaseCreated")
+ .then((event) => {
IndexedDBAgent.requestDatabase(WebInspector.frameResourceManager.mainFrame.securityOrigin, "CompleteDatabase", (error, databaseWithObjectStores) => {
InspectorTest.expectNoError(error);
let objectStores = databaseWithObjectStores.objectStores;
@@ -71,6 +73,8 @@
resolve();
});
});
+
+ InspectorTest.evaluateInPage("createDatabaseWithStores('CompleteDatabase', 456)");
}
});
Modified: trunk/LayoutTests/inspector/indexeddb/requestDatabaseNames.html (206110 => 206111)
--- trunk/LayoutTests/inspector/indexeddb/requestDatabaseNames.html 2016-09-19 20:39:55 UTC (rev 206110)
+++ trunk/LayoutTests/inspector/indexeddb/requestDatabaseNames.html 2016-09-19 20:41:28 UTC (rev 206111)
@@ -11,7 +11,7 @@
suite.addTestCase({
name: "ClearDatabases",
description: "Remove any existing IndexedDB databases.",
- test: (resolve, reject) => {
+ test(resolve, reject) {
// FIXME: Remove any existing IndexedDB databases that might exist to workaround:
// <https://webkit.org/b/148006> Each test should run with its own clean data store
IndexedDBAgent.requestDatabaseNames(WebInspector.frameResourceManager.mainFrame.securityOrigin, (error, names) => {
@@ -23,7 +23,7 @@
suite.addTestCase({
name: "EnsureNoDatabases",
description: "Ensure no databases exist at the start.",
- test: (resolve, reject) => {
+ test(resolve, reject) {
IndexedDBAgent.requestDatabaseNames(WebInspector.frameResourceManager.mainFrame.securityOrigin, (error, names) => {
InspectorTest.expectNoError(error);
InspectorTest.expectThat(names.length === 0, "No IndexedDB databases should exist initially.");
@@ -35,9 +35,9 @@
suite.addTestCase({
name: "CreateDatabase1",
description: "Create a first database.",
- test: (resolve, reject) => {
- InspectorTest.evaluateInPage("createEmptyDatabase('Database1')");
- InspectorTest.singleFireEventListener("DatabaseCreated", (event) => {
+ test(resolve, reject) {
+ InspectorTest.awaitEvent("DatabaseCreated")
+ .then((event) => {
IndexedDBAgent.requestDatabaseNames(WebInspector.frameResourceManager.mainFrame.securityOrigin, (error, names) => {
InspectorTest.expectNoError(error);
InspectorTest.expectThat(names.length === 1, "A single IndexedDB database should exist.");
@@ -45,6 +45,8 @@
resolve();
});
});
+
+ InspectorTest.evaluateInPage("createEmptyDatabase('Database1')");
}
});
@@ -51,9 +53,9 @@
suite.addTestCase({
name: "CreateDatabase2",
description: "Create a second database.",
- test: (resolve, reject) => {
- InspectorTest.evaluateInPage("createEmptyDatabase('Database2')");
- InspectorTest.singleFireEventListener("DatabaseCreated", (event) => {
+ test(resolve, reject) {
+ InspectorTest.awaitEvent("DatabaseCreated")
+ .then((event) => {
IndexedDBAgent.requestDatabaseNames(WebInspector.frameResourceManager.mainFrame.securityOrigin, (error, names) => {
InspectorTest.expectNoError(error);
InspectorTest.expectThat(names.length === 2, "Two IndexedDB databases should exist.");
@@ -61,6 +63,8 @@
resolve();
});
});
+
+ InspectorTest.evaluateInPage("createEmptyDatabase('Database2')");
}
});
@@ -67,9 +71,9 @@
suite.addTestCase({
name: "CreateDatabase3",
description: "Create a third database with a unicode name.",
- test: (resolve, reject) => {
- InspectorTest.evaluateInPage("createEmptyDatabase('\u124d')");
- InspectorTest.singleFireEventListener("DatabaseCreated", (event) => {
+ test(resolve, reject) {
+ InspectorTest.awaitEvent("DatabaseCreated")
+ .then((event) => {
IndexedDBAgent.requestDatabaseNames(WebInspector.frameResourceManager.mainFrame.securityOrigin, (error, names) => {
InspectorTest.expectNoError(error);
InspectorTest.expectThat(names.length === 3, "Three IndexedDB databases should exist.");
@@ -77,6 +81,8 @@
resolve();
});
});
+
+ InspectorTest.evaluateInPage("createEmptyDatabase('\u124d')");
}
});
@@ -83,9 +89,9 @@
suite.addTestCase({
name: "CreateDatabase4",
description: "Create a fourth database with a unicode name.",
- test: (resolve, reject) => {
- InspectorTest.evaluateInPage("createEmptyDatabase('\ud800\udf46')");
- InspectorTest.singleFireEventListener("DatabaseCreated", (event) => {
+ test(resolve, reject) {
+ InspectorTest.awaitEvent("DatabaseCreated")
+ .then((event) => {
IndexedDBAgent.requestDatabaseNames(WebInspector.frameResourceManager.mainFrame.securityOrigin, (error, names) => {
InspectorTest.expectNoError(error);
InspectorTest.expectThat(names.length === 4, "Four IndexedDB databases should exist.");
@@ -93,6 +99,8 @@
resolve();
});
});
+
+ InspectorTest.evaluateInPage("createEmptyDatabase('\ud800\udf46')");
}
});
