Diff
Modified: trunk/LayoutTests/ChangeLog (195300 => 195301)
--- trunk/LayoutTests/ChangeLog 2016-01-19 19:34:20 UTC (rev 195300)
+++ trunk/LayoutTests/ChangeLog 2016-01-19 19:35:31 UTC (rev 195301)
@@ -1,5 +1,15 @@
2016-01-19 Brady Eidson <[email protected]>
+ Modern IDB: Split all storage/indexeddb/mozilla tests into separate HTML + JS format.
+ https://bugs.webkit.org/show_bug.cgi?id=153237
+
+ Reviewed by Sam Weinig.
+
+ * storage/indexeddb/mozilla/index-prev-no-duplicate.html:
+ * storage/indexeddb/mozilla/resources/index-prev-no-duplicate.js: Copied from LayoutTests/storage/indexeddb/mozilla/index-prev-no-duplicate.html.
+
+2016-01-19 Brady Eidson <[email protected]>
+
Modern IDB: Split all storage/indexeddb tests into separate HTML + JS format.
https://bugs.webkit.org/show_bug.cgi?id=153178
Modified: trunk/LayoutTests/storage/indexeddb/mozilla/index-prev-no-duplicate.html (195300 => 195301)
--- trunk/LayoutTests/storage/indexeddb/mozilla/index-prev-no-duplicate.html 2016-01-19 19:34:20 UTC (rev 195300)
+++ trunk/LayoutTests/storage/indexeddb/mozilla/index-prev-no-duplicate.html 2016-01-19 19:35:31 UTC (rev 195301)
@@ -11,147 +11,6 @@
<script src=""
</head>
<body>
-<script>
-
-description("Test IndexedDB: iterating backwards through an index, skipping duplicates");
-
-indexedDBTest(prepareDatabase, testPrev);
-function prepareDatabase()
-{
- db = event.target.result;
- trans = event.target.transaction;
-
- objectStoreName = "People";
-
- objectStoreData = [
- { key: "237-23-7732", value: { name: "Bob", height: 60, weight: 120 } },
- { key: "237-23-7733", value: { name: "Ann", height: 52, weight: 110 } },
- { key: "237-23-7734", value: { name: "Ron", height: 73, weight: 180 } },
- { key: "237-23-7735", value: { name: "Sue", height: 58, weight: 130 } },
- { key: "237-23-7736", value: { name: "Joe", height: 65, weight: 150 } },
- { key: "237-23-7737", value: { name: "Pat", height: 65, weight: 100 } },
- { key: "237-23-7738", value: { name: "Leo", height: 65, weight: 180 } },
- { key: "237-23-7739", value: { name: "Jef", height: 65, weight: 120 } },
- { key: "237-23-7740", value: { name: "Sam", height: 73, weight: 110 } },
- ];
-
- indexData = [
- { name: "name", keyPath: "name", options: { unique: true } },
- { name: "height", keyPath: "height", options: { } },
- { name: "weight", keyPath: "weight", options: { unique: false } }
- ];
-
- objectStoreDataHeightSort = [
- { key: "237-23-7733", value: { name: "Ann", height: 52, weight: 110 } },
- { key: "237-23-7735", value: { name: "Sue", height: 58, weight: 130 } },
- { key: "237-23-7732", value: { name: "Bob", height: 60, weight: 120 } },
- { key: "237-23-7736", value: { name: "Joe", height: 65, weight: 150 } },
- { key: "237-23-7737", value: { name: "Pat", height: 65, weight: 100 } },
- { key: "237-23-7738", value: { name: "Leo", height: 65, weight: 180 } },
- { key: "237-23-7739", value: { name: "Jef", height: 65, weight: 120 } },
- { key: "237-23-7734", value: { name: "Ron", height: 73, weight: 180 } },
- { key: "237-23-7740", value: { name: "Sam", height: 73, weight: 110 } },
- ];
-
- objectStore = evalAndLog("objectStore = db.createObjectStore(objectStoreName);");
- debug("First, add all our data to the object store.");
- addedData = 0;
- for (i in objectStoreData) {
- request = evalAndLog("request = objectStore.add(objectStoreData[i].value, objectStoreData[i].key);");
- request._onerror_ = unexpectedErrorCallback;
- request._onsuccess_ = function(event)
- {
- if (++addedData == objectStoreData.length) {
- createIndexes();
- }
- }
- }
- trans._oncomplete_ = function() {
- evalAndLog("trans = db.transaction(objectStoreName, 'readwrite')");
- evalAndLog("objectStore = trans.objectStore(objectStoreName)");
- };
-}
-
-function createIndexes()
-{
- debug("Now create the indexes.");
- for (i in indexData) {
- evalAndLog("objectStore.createIndex(indexData[i].name, indexData[i].keyPath, indexData[i].options);");
- }
-}
-
-function testPrev()
-{
- debug("testPrev()");
- trans = evalAndLog("trans = db.transaction(objectStoreName)");
- objectStore = evalAndLog("objectStore = trans.objectStore(objectStoreName);");
- keyIndex = evalAndLog("keyIndex = 8;");
- // first try with just PREV
- request = evalAndLog("request = objectStore.index('height').openCursor(null, 'prev');");
- request._onerror_ = unexpectedErrorCallback;
- request._onsuccess_ = function(event)
- {
- cursor = evalAndLog("cursor = event.target.result;");
- if (cursor) {
- shouldBe("cursor.key", "" + objectStoreDataHeightSort[keyIndex].value.height);
- shouldBe("cursor.primaryKey", "'" + objectStoreDataHeightSort[keyIndex].key + "'");
- shouldBe("cursor.value.name", "'" + objectStoreDataHeightSort[keyIndex].value.name + "'");
- shouldBe("cursor.value.height", "" + objectStoreDataHeightSort[keyIndex].value.height);
- if ('weight' in cursor.value) {
- shouldBe("cursor.value.weight", "" + objectStoreDataHeightSort[keyIndex].value.weight);
- }
-
- evalAndLog("cursor.continue();");
- evalAndLog("keyIndex--;");
- debug(" => " + keyIndex);
- }
- else {
- debug("No cursor: " + cursor);
- shouldBe("keyIndex", "-1");
- }
- };
- trans._oncomplete_ = testPrevNoDuplicate;
-}
-
-function testPrevNoDuplicate()
-{
- debug("testPrevNoDuplicate()");
- objectStore = evalAndLog("objectStore = db.transaction(objectStoreName).objectStore(objectStoreName);");
- keyIndex = evalAndLog("keyIndex = 8;");
- request = evalAndLog("request = objectStore.index('height').openCursor(null, 'prevunique');");
- request._onerror_ = unexpectedErrorCallback;
- request._onsuccess_ = function (event)
- {
- cursor = evalAndLog("cursor = event.target.result;");
- if (keyIndex == 8) {
- evalAndLog("keyIndex -= 1");
- }
- if (keyIndex == 6) {
- evalAndLog("keyIndex -= 3;");
- }
- debug(" => Entering with keyIndex = " + keyIndex);
- if (cursor) {
- shouldBe("cursor.key", "" + objectStoreDataHeightSort[keyIndex].value.height);
- shouldBe("cursor.primaryKey", "'" + objectStoreDataHeightSort[keyIndex].key + "'");
- shouldBe("cursor.value.name", "'" + objectStoreDataHeightSort[keyIndex].value.name + "'");
- shouldBe("cursor.value.height", "" + objectStoreDataHeightSort[keyIndex].value.height);
- if ('weight' in cursor.value) {
- shouldBe("cursor.value.weight", "" + objectStoreDataHeightSort[keyIndex].value.weight);
- }
-
- evalAndLog("cursor.continue();");
- evalAndLog("keyIndex--;");
- }
- else {
- debug("No cursor: " + cursor);
- shouldBe("keyIndex", "-1");
- finishJSTest();
- }
- }
-}
-
-var successfullyParsed = true;
-
-</script>
+<script src=""
</body>
</html>
Copied: trunk/LayoutTests/storage/indexeddb/mozilla/resources/index-prev-no-duplicate.js (from rev 195300, trunk/LayoutTests/storage/indexeddb/mozilla/index-prev-no-duplicate.html) (0 => 195301)
--- trunk/LayoutTests/storage/indexeddb/mozilla/resources/index-prev-no-duplicate.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/mozilla/resources/index-prev-no-duplicate.js 2016-01-19 19:35:31 UTC (rev 195301)
@@ -0,0 +1,148 @@
+// original test: http://mxr.mozilla.org/mozilla2.0/source/dom/indexedDB/test/test_indexes.html?force=1
+// license of original test:
+// " Any copyright is dedicated to the Public Domain.
+// http://creativecommons.org/publicdomain/zero/1.0/ "
+
+if (this.importScripts) {
+ importScripts('../../../../resources/js-test.js');
+ importScripts('../../resources/shared.js');
+}
+
+description("Test IndexedDB: iterating backwards through an index, skipping duplicates");
+
+indexedDBTest(prepareDatabase, testPrev);
+function prepareDatabase()
+{
+ db = event.target.result;
+ trans = event.target.transaction;
+
+ objectStoreName = "People";
+
+ objectStoreData = [
+ { key: "237-23-7732", value: { name: "Bob", height: 60, weight: 120 } },
+ { key: "237-23-7733", value: { name: "Ann", height: 52, weight: 110 } },
+ { key: "237-23-7734", value: { name: "Ron", height: 73, weight: 180 } },
+ { key: "237-23-7735", value: { name: "Sue", height: 58, weight: 130 } },
+ { key: "237-23-7736", value: { name: "Joe", height: 65, weight: 150 } },
+ { key: "237-23-7737", value: { name: "Pat", height: 65, weight: 100 } },
+ { key: "237-23-7738", value: { name: "Leo", height: 65, weight: 180 } },
+ { key: "237-23-7739", value: { name: "Jef", height: 65, weight: 120 } },
+ { key: "237-23-7740", value: { name: "Sam", height: 73, weight: 110 } },
+ ];
+
+ indexData = [
+ { name: "name", keyPath: "name", options: { unique: true } },
+ { name: "height", keyPath: "height", options: { } },
+ { name: "weight", keyPath: "weight", options: { unique: false } }
+ ];
+
+ objectStoreDataHeightSort = [
+ { key: "237-23-7733", value: { name: "Ann", height: 52, weight: 110 } },
+ { key: "237-23-7735", value: { name: "Sue", height: 58, weight: 130 } },
+ { key: "237-23-7732", value: { name: "Bob", height: 60, weight: 120 } },
+ { key: "237-23-7736", value: { name: "Joe", height: 65, weight: 150 } },
+ { key: "237-23-7737", value: { name: "Pat", height: 65, weight: 100 } },
+ { key: "237-23-7738", value: { name: "Leo", height: 65, weight: 180 } },
+ { key: "237-23-7739", value: { name: "Jef", height: 65, weight: 120 } },
+ { key: "237-23-7734", value: { name: "Ron", height: 73, weight: 180 } },
+ { key: "237-23-7740", value: { name: "Sam", height: 73, weight: 110 } },
+ ];
+
+ objectStore = evalAndLog("objectStore = db.createObjectStore(objectStoreName);");
+ debug("First, add all our data to the object store.");
+ addedData = 0;
+ for (i in objectStoreData) {
+ request = evalAndLog("request = objectStore.add(objectStoreData[i].value, objectStoreData[i].key);");
+ request._onerror_ = unexpectedErrorCallback;
+ request._onsuccess_ = function(event)
+ {
+ if (++addedData == objectStoreData.length) {
+ createIndexes();
+ }
+ }
+ }
+ trans._oncomplete_ = function() {
+ evalAndLog("trans = db.transaction(objectStoreName, 'readwrite')");
+ evalAndLog("objectStore = trans.objectStore(objectStoreName)");
+ };
+}
+
+function createIndexes()
+{
+ debug("Now create the indexes.");
+ for (i in indexData) {
+ evalAndLog("objectStore.createIndex(indexData[i].name, indexData[i].keyPath, indexData[i].options);");
+ }
+}
+
+function testPrev()
+{
+ debug("testPrev()");
+ trans = evalAndLog("trans = db.transaction(objectStoreName)");
+ objectStore = evalAndLog("objectStore = trans.objectStore(objectStoreName);");
+ keyIndex = evalAndLog("keyIndex = 8;");
+ // first try with just PREV
+ request = evalAndLog("request = objectStore.index('height').openCursor(null, 'prev');");
+ request._onerror_ = unexpectedErrorCallback;
+ request._onsuccess_ = function(event)
+ {
+ cursor = evalAndLog("cursor = event.target.result;");
+ if (cursor) {
+ shouldBe("cursor.key", "" + objectStoreDataHeightSort[keyIndex].value.height);
+ shouldBe("cursor.primaryKey", "'" + objectStoreDataHeightSort[keyIndex].key + "'");
+ shouldBe("cursor.value.name", "'" + objectStoreDataHeightSort[keyIndex].value.name + "'");
+ shouldBe("cursor.value.height", "" + objectStoreDataHeightSort[keyIndex].value.height);
+ if ('weight' in cursor.value) {
+ shouldBe("cursor.value.weight", "" + objectStoreDataHeightSort[keyIndex].value.weight);
+ }
+
+ evalAndLog("cursor.continue();");
+ evalAndLog("keyIndex--;");
+ debug(" => " + keyIndex);
+ }
+ else {
+ debug("No cursor: " + cursor);
+ shouldBe("keyIndex", "-1");
+ }
+ };
+ trans._oncomplete_ = testPrevNoDuplicate;
+}
+
+function testPrevNoDuplicate()
+{
+ debug("testPrevNoDuplicate()");
+ objectStore = evalAndLog("objectStore = db.transaction(objectStoreName).objectStore(objectStoreName);");
+ keyIndex = evalAndLog("keyIndex = 8;");
+ request = evalAndLog("request = objectStore.index('height').openCursor(null, 'prevunique');");
+ request._onerror_ = unexpectedErrorCallback;
+ request._onsuccess_ = function (event)
+ {
+ cursor = evalAndLog("cursor = event.target.result;");
+ if (keyIndex == 8) {
+ evalAndLog("keyIndex -= 1");
+ }
+ if (keyIndex == 6) {
+ evalAndLog("keyIndex -= 3;");
+ }
+ debug(" => Entering with keyIndex = " + keyIndex);
+ if (cursor) {
+ shouldBe("cursor.key", "" + objectStoreDataHeightSort[keyIndex].value.height);
+ shouldBe("cursor.primaryKey", "'" + objectStoreDataHeightSort[keyIndex].key + "'");
+ shouldBe("cursor.value.name", "'" + objectStoreDataHeightSort[keyIndex].value.name + "'");
+ shouldBe("cursor.value.height", "" + objectStoreDataHeightSort[keyIndex].value.height);
+ if ('weight' in cursor.value) {
+ shouldBe("cursor.value.weight", "" + objectStoreDataHeightSort[keyIndex].value.weight);
+ }
+
+ evalAndLog("cursor.continue();");
+ evalAndLog("keyIndex--;");
+ }
+ else {
+ debug("No cursor: " + cursor);
+ shouldBe("keyIndex", "-1");
+ finishJSTest();
+ }
+ }
+}
+
+var successfullyParsed = true;
