<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[195301] trunk/LayoutTests</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/195301">195301</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-01-19 11:35:31 -0800 (Tue, 19 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmozillaindexprevnoduplicatehtml">trunk/LayoutTests/storage/indexeddb/mozilla/index-prev-no-duplicate.html</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsstorageindexeddbmozillaresourcesindexprevnoduplicatejs">trunk/LayoutTests/storage/indexeddb/mozilla/resources/index-prev-no-duplicate.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (195300 => 195301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-01-19 19:34:20 UTC (rev 195300)
+++ trunk/LayoutTests/ChangeLog 2016-01-19 19:35:31 UTC (rev 195301)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2016-01-19 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><ins>+ 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 <beidson@apple.com>
+
</ins><span class="cx"> Modern IDB: Split all storage/indexeddb tests into separate HTML + JS format.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=153178
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmozillaindexprevnoduplicatehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/mozilla/index-prev-no-duplicate.html (195300 => 195301)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -11,147 +11,6 @@
</span><span class="cx"> <script src="../resources/shared.js"></script>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><del>-<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>
</del><ins>+<script src="resources/index-prev-no-duplicate.js"></script>
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmozillaresourcesindexprevnoduplicatejsfromrev195300trunkLayoutTestsstorageindexeddbmozillaindexprevnoduplicatehtml"></a>
<div class="copfile"><h4>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)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,148 @@
</span><ins>+// 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;
</ins></span></pre>
</div>
</div>
</body>
</html>