<!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>[193660] 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/193660">193660</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2015-12-07 15:43:38 -0800 (Mon, 07 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modern IDB: Miscellaneous test cleanup.
https://bugs.webkit.org/show_bug.cgi?id=151968
Reviewed by Sam Weinig.
- Reorganize TestExpectations a bit.
- Remove two tests that primarily test features that have been removed from the spec.
* platform/mac-wk1/TestExpectations:
* storage/indexeddb/cursor-continueprimarykey-expected.txt: Removed.
* storage/indexeddb/cursor-continueprimarykey.html: Removed.
* storage/indexeddb/factory-basics-expected.txt: Removed.
* storage/indexeddb/factory-basics.html: Removed.
* storage/indexeddb/resources/cursor-continueprimarykey.js: Removed.
* storage/indexeddb/resources/factory-basics.js: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk1TestExpectations">trunk/LayoutTests/platform/mac-wk1/TestExpectations</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsstorageindexeddbcursorcontinueprimarykeyexpectedtxt">trunk/LayoutTests/storage/indexeddb/cursor-continueprimarykey-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbcursorcontinueprimarykeyhtml">trunk/LayoutTests/storage/indexeddb/cursor-continueprimarykey.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbfactorybasicsexpectedtxt">trunk/LayoutTests/storage/indexeddb/factory-basics-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbfactorybasicshtml">trunk/LayoutTests/storage/indexeddb/factory-basics.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbresourcescursorcontinueprimarykeyjs">trunk/LayoutTests/storage/indexeddb/resources/cursor-continueprimarykey.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbresourcesfactorybasicsjs">trunk/LayoutTests/storage/indexeddb/resources/factory-basics.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (193659 => 193660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-12-07 23:15:54 UTC (rev 193659)
+++ trunk/LayoutTests/ChangeLog 2015-12-07 23:43:38 UTC (rev 193660)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2015-12-07 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><ins>+ Modern IDB: Miscellaneous test cleanup.
+ https://bugs.webkit.org/show_bug.cgi?id=151968
+
+ Reviewed by Sam Weinig.
+
+ - Reorganize TestExpectations a bit.
+ - Remove two tests that primarily test features that have been removed from the spec.
+
+ * platform/mac-wk1/TestExpectations:
+ * storage/indexeddb/cursor-continueprimarykey-expected.txt: Removed.
+ * storage/indexeddb/cursor-continueprimarykey.html: Removed.
+ * storage/indexeddb/factory-basics-expected.txt: Removed.
+ * storage/indexeddb/factory-basics.html: Removed.
+ * storage/indexeddb/resources/cursor-continueprimarykey.js: Removed.
+ * storage/indexeddb/resources/factory-basics.js: Removed.
+
+2015-12-07 Brady Eidson <beidson@apple.com>
+
</ins><span class="cx"> Modern IDB: storage/indexeddb/factory-deletedatabase.html fails.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=151966
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (193659 => 193660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/TestExpectations 2015-12-07 23:15:54 UTC (rev 193659)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations 2015-12-07 23:43:38 UTC (rev 193660)
</span><span class="lines">@@ -110,9 +110,6 @@
</span><span class="cx"> # IDB tests with text failures
</span><span class="cx"> storage/indexeddb/createIndex-after-failure.html [ Failure ]
</span><span class="cx"> storage/indexeddb/cursor-continue.html [ Failure ]
</span><del>-storage/indexeddb/cursor-continueprimarykey.html [ Failure ]
-storage/indexeddb/cursor-leak.html [ Failure ]
-storage/indexeddb/cursor-request-cycle.html [ Failure ]
</del><span class="cx"> storage/indexeddb/database-deletepending-flag.html [ Failure ]
</span><span class="cx"> storage/indexeddb/database-wrapper.html [ Failure ]
</span><span class="cx"> storage/indexeddb/delete-in-upgradeneeded-close-in-open-success.html [ Failure ]
</span><span class="lines">@@ -120,7 +117,6 @@
</span><span class="cx"> storage/indexeddb/deletedatabase-delayed-by-open-and-versionchange.html [ Failure ]
</span><span class="cx"> storage/indexeddb/deletedatabase-not-blocked.html [ Failure ]
</span><span class="cx"> storage/indexeddb/dont-commit-on-blocked.html [ Failure ]
</span><del>-storage/indexeddb/factory-basics.html [ Failure ]
</del><span class="cx"> storage/indexeddb/factory-cmp.html [ Failure ]
</span><span class="cx"> storage/indexeddb/index-basics.html [ Failure ]
</span><span class="cx"> storage/indexeddb/index-count.html [ Failure ]
</span><span class="lines">@@ -146,12 +142,16 @@
</span><span class="cx"> storage/indexeddb/pending-version-change-stuck-works-with-terminate.html [ Failure ]
</span><span class="cx"> storage/indexeddb/pending-version-change-stuck.html [ Failure ]
</span><span class="cx"> storage/indexeddb/properties-disabled-at-runtime.html [ Failure ]
</span><del>-storage/indexeddb/request-leak.html [ Failure ]
</del><span class="cx"> storage/indexeddb/setversion-blocked-by-versionchange-close.html [ Failure ]
</span><span class="cx"> storage/indexeddb/setversion-not-blocked.html [ Failure ]
</span><span class="cx"> storage/indexeddb/transaction-scope-sequencing.html [ Failure ]
</span><span class="cx"> storage/indexeddb/version-change-abort.html [ Failure ]
</span><span class="cx">
</span><ins>+# Relies on internals.observeGC
+storage/indexeddb/cursor-leak.html [ Failure ]
+storage/indexeddb/cursor-request-cycle.html [ Failure ]
+storage/indexeddb/request-leak.html [ Failure ]
+
</ins><span class="cx"> # No workers support in Modern IDB yet
</span><span class="cx"> storage/indexeddb/basics-workers.html
</span><span class="cx"> storage/indexeddb/cursor-advance-workers.html
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbcursorcontinueprimarykeyexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/storage/indexeddb/cursor-continueprimarykey-expected.txt (193659 => 193660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/cursor-continueprimarykey-expected.txt 2015-12-07 23:15:54 UTC (rev 193659)
+++ trunk/LayoutTests/storage/indexeddb/cursor-continueprimarykey-expected.txt 2015-12-07 23:43:38 UTC (rev 193660)
</span><span class="lines">@@ -1,174 +0,0 @@
</span><del>-Test IndexedDB's IDBCursor.continue() with a primary key parameter.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-indexedDB = self.indexedDB || self.webkitIndexedDB || self.mozIndexedDB || self.msIndexedDB || self.OIndexedDB;
-
-dbname = "cursor-continueprimarykey.html"
-indexedDB.deleteDatabase(dbname)
-indexedDB.open(dbname)
-
-prepareDatabase():
-db = event.target.result
-store = db.createObjectStore('store')
-index = store.createIndex('index', 'indexKey', {multiEntry: true})
-store.put({indexKey: ['a', 'b']}, 1)
-store.put({indexKey: ['a', 'b']}, 2)
-store.put({indexKey: ['a', 'b']}, 3)
-store.put({indexKey: ['b']}, 4)
-checking index structure...
-
-index key primary key
-========= ===========
-a 1
-a 2
-a 3
-b 1
-b 2
-b 3
-b 4
-
-Test case: cursor.continue()
-
-tx = db.transaction('store')
-request = tx.objectStore('store').index('index').openCursor()
-cursor.continue()
-PASS cursor.key is "a"
-PASS cursor.primaryKey is 2
-
-Test case: cursor.continue('a')
-
-tx = db.transaction('store')
-request = tx.objectStore('store').index('index').openCursor()
-Expecting exception from cursor.continue('a')
-PASS Exception was thrown.
-PASS code is 0
-PASS ename is 'DataError'
-Exception message: Failed to execute 'continue' on 'IDBCursor': The parameter is less than or equal to this cursor's position.
-
-Test case: cursor.continue('b')
-
-tx = db.transaction('store')
-request = tx.objectStore('store').index('index').openCursor()
-cursor.continue('b')
-PASS cursor.key is "b"
-PASS cursor.primaryKey is 1
-
-Test case: cursor.continue('c')
-
-tx = db.transaction('store')
-request = tx.objectStore('store').index('index').openCursor()
-cursor.continue('c')
-PASS cursor is null
-
-Test case: cursor.continuePrimaryKey('a', 3)
-
-tx = db.transaction('store')
-request = tx.objectStore('store').index('index').openCursor()
-cursor.continuePrimaryKey('a', 3)
-PASS cursor.key is "a"
-PASS cursor.primaryKey is 3
-
-Test case: cursor.continuePrimaryKey('a', 4)
-
-tx = db.transaction('store')
-request = tx.objectStore('store').index('index').openCursor()
-cursor.continuePrimaryKey('a', 4)
-PASS cursor.key is "b"
-PASS cursor.primaryKey is 1
-
-Test case: cursor.continuePrimaryKey('b', 1)
-
-tx = db.transaction('store')
-request = tx.objectStore('store').index('index').openCursor()
-cursor.continuePrimaryKey('b', 1)
-PASS cursor.key is "b"
-PASS cursor.primaryKey is 1
-
-Test case: cursor.continuePrimaryKey('b', 4)
-
-tx = db.transaction('store')
-request = tx.objectStore('store').index('index').openCursor()
-cursor.continuePrimaryKey('b', 4)
-PASS cursor.key is "b"
-PASS cursor.primaryKey is 4
-
-Test case: cursor.continuePrimaryKey('b', 5)
-
-tx = db.transaction('store')
-request = tx.objectStore('store').index('index').openCursor()
-cursor.continuePrimaryKey('b', 5)
-PASS cursor is null
-
-Test case: cursor.continuePrimaryKey('c', 1)
-
-tx = db.transaction('store')
-request = tx.objectStore('store').index('index').openCursor()
-cursor.continuePrimaryKey('c', 1)
-PASS cursor is null
-
-Test case: cursor.continuePrimaryKey(null, 1)
-
-tx = db.transaction('store')
-request = tx.objectStore('store').index('index').openCursor()
-Expecting exception from cursor.continuePrimaryKey(null, 1)
-PASS Exception was thrown.
-PASS code is 0
-PASS ename is 'DataError'
-Exception message: Failed to execute 'continuePrimaryKey' on 'IDBCursor': The parameter is not a valid key.
-
-Test case: cursor.continuePrimaryKey(null, 2)
-
-tx = db.transaction('store')
-request = tx.objectStore('store').index('index').openCursor()
-Expecting exception from cursor.continuePrimaryKey(null, 2)
-PASS Exception was thrown.
-PASS code is 0
-PASS ename is 'DataError'
-Exception message: Failed to execute 'continuePrimaryKey' on 'IDBCursor': The parameter is not a valid key.
-
-Test case: cursor.continuePrimaryKey(null, 3)
-
-tx = db.transaction('store')
-request = tx.objectStore('store').index('index').openCursor()
-Expecting exception from cursor.continuePrimaryKey(null, 3)
-PASS Exception was thrown.
-PASS code is 0
-PASS ename is 'DataError'
-Exception message: Failed to execute 'continuePrimaryKey' on 'IDBCursor': The parameter is not a valid key.
-
-Test case: cursor.continuePrimaryKey(null, 4)
-
-tx = db.transaction('store')
-request = tx.objectStore('store').index('index').openCursor()
-Expecting exception from cursor.continuePrimaryKey(null, 4)
-PASS Exception was thrown.
-PASS code is 0
-PASS ename is 'DataError'
-Exception message: Failed to execute 'continuePrimaryKey' on 'IDBCursor': The parameter is not a valid key.
-
-Test case: cursor.continuePrimaryKey(null, 5)
-
-tx = db.transaction('store')
-request = tx.objectStore('store').index('index').openCursor()
-Expecting exception from cursor.continuePrimaryKey(null, 5)
-PASS Exception was thrown.
-PASS code is 0
-PASS ename is 'DataError'
-Exception message: Failed to execute 'continuePrimaryKey' on 'IDBCursor': The parameter is not a valid key.
-
-Test case: cursor.continuePrimaryKey('a', null)
-
-tx = db.transaction('store')
-request = tx.objectStore('store').index('index').openCursor()
-Expecting exception from cursor.continuePrimaryKey('a', null)
-PASS Exception was thrown.
-PASS code is 0
-PASS ename is 'DataError'
-Exception message: Failed to execute 'continuePrimaryKey' on 'IDBCursor': The parameter is not a valid key.
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
</del></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbcursorcontinueprimarykeyhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/storage/indexeddb/cursor-continueprimarykey.html (193659 => 193660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/cursor-continueprimarykey.html 2015-12-07 23:15:54 UTC (rev 193659)
+++ trunk/LayoutTests/storage/indexeddb/cursor-continueprimarykey.html 2015-12-07 23:43:38 UTC (rev 193660)
</span><span class="lines">@@ -1,4 +0,0 @@
</span><del>-<!DOCTYPE html>
-<script src="../../resources/js-test.js"></script>
-<script src="resources/shared.js"></script>
-<script src="resources/cursor-continueprimarykey.js"></script>
</del></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbfactorybasicsexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/storage/indexeddb/factory-basics-expected.txt (193659 => 193660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/factory-basics-expected.txt 2015-12-07 23:15:54 UTC (rev 193659)
+++ trunk/LayoutTests/storage/indexeddb/factory-basics-expected.txt 2015-12-07 23:43:38 UTC (rev 193660)
</span><span class="lines">@@ -1,35 +0,0 @@
</span><del>-Test the basics of IndexedDB's IDBFactory.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-indexedDB = self.indexedDB || self.webkitIndexedDB || self.mozIndexedDB || self.msIndexedDB || self.OIndexedDB;
-
-PASS typeof indexedDB.open is "function"
-PASS typeof indexedDB.cmp is "function"
-PASS typeof indexedDB.deleteDatabase is "function"
-PASS typeof indexedDB.webkitGetDatabaseNames is "function"
-PASS typeof indexedDB.getDatabaseNames is "undefined"
-request = indexedDB.webkitGetDatabaseNames()
-PASS request.source is null
-databaseNames = event.target.result
-PASS databaseNames.contains('storage/indexeddb/factory-basics') is false
-PASS databaseNames.contains('DATABASE THAT DOES NOT EXIST') is false
-request = indexedDB.open(name)
-PASS request.source is null
-event.target.result.close()
-indexedDB.webkitGetDatabaseNames()
-databaseNames = event.target.result
-PASS databaseNames.contains('storage/indexeddb/factory-basics') is true
-PASS databaseNames.contains('DATABASE THAT DOES NOT EXIST') is false
-request = indexedDB.deleteDatabase('storage/indexeddb/factory-basics')
-PASS request.source is null
-indexedDB.webkitGetDatabaseNames()
-databaseNames = event.target.result
-PASS databaseNames.contains('storage/indexeddb/factory-basics') is false
-PASS databaseNames.contains('DATABASE THAT DOES NOT EXIST') is false
-indexedDB.deleteDatabase('DATABASE THAT DOES NOT EXIST')
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
</del></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbfactorybasicshtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/storage/indexeddb/factory-basics.html (193659 => 193660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/factory-basics.html 2015-12-07 23:15:54 UTC (rev 193659)
+++ trunk/LayoutTests/storage/indexeddb/factory-basics.html 2015-12-07 23:43:38 UTC (rev 193660)
</span><span class="lines">@@ -1,9 +0,0 @@
</span><del>-<html>
-<head>
-<script src="../../resources/js-test.js"></script>
-<script src="resources/shared.js"></script>
-</head>
-<body>
-<script src="resources/factory-basics.js"></script>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbresourcescursorcontinueprimarykeyjs"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/storage/indexeddb/resources/cursor-continueprimarykey.js (193659 => 193660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/resources/cursor-continueprimarykey.js 2015-12-07 23:15:54 UTC (rev 193659)
+++ trunk/LayoutTests/storage/indexeddb/resources/cursor-continueprimarykey.js 2015-12-07 23:43:38 UTC (rev 193660)
</span><span class="lines">@@ -1,115 +0,0 @@
</span><del>-if (this.importScripts) {
- importScripts('../../../fast/js/resources/js-test-pre.js');
- importScripts('shared.js');
-}
-
-description("Test IndexedDB's IDBCursor.continue() with a primary key parameter.");
-
-indexedDBTest(prepareDatabase, verifyContinueCalls);
-function prepareDatabase(evt)
-{
- preamble(evt);
-
- evalAndLog("db = event.target.result");
- evalAndLog("store = db.createObjectStore('store')");
- evalAndLog("index = store.createIndex('index', 'indexKey', {multiEntry: true})");
-
- evalAndLog("store.put({indexKey: ['a', 'b']}, 1)");
- evalAndLog("store.put({indexKey: ['a', 'b']}, 2)");
- evalAndLog("store.put({indexKey: ['a', 'b']}, 3)");
- evalAndLog("store.put({indexKey: ['b']}, 4)");
-
- var indexExpected = [
- {key: "a", primaryKey: 1},
- {key: "a", primaryKey: 2},
- {key: "a", primaryKey: 3},
- {key: "b", primaryKey: 1},
- {key: "b", primaryKey: 2},
- {key: "b", primaryKey: 3},
- {key: "b", primaryKey: 4}
- ];
- debug("checking index structure...");
- debug("");
- debug("index key primary key");
- debug("========= ===========");
- var quiet = true;
- evalAndLog("request = index.openCursor()", quiet);
- request.onerror = unexpectedErrorCallback;
- request.onsuccess = function onCursorSuccess() {
- evalAndLog("cursor = request.result", quiet);
- var expectedEntry = indexExpected.shift();
- if (expectedEntry) {
- shouldBe("cursor.key", JSON.stringify(expectedEntry.key), quiet);
- shouldBe("cursor.primaryKey", JSON.stringify(expectedEntry.primaryKey), quiet);
- debug(cursor.key + " " + cursor.primaryKey);
- evalAndLog("cursor.continue()", quiet);
- } else {
- shouldBeNull("cursor", quiet);
- }
- };
-}
-
-var testCases = [
- // Continuing index key
- { call: "cursor.continue()", result: { key: "a", primaryKey: 2 } },
- { call: "cursor.continue('a')", exception: 'DataError' },
- { call: "cursor.continue('b')", result: { key: "b", primaryKey: 1 } },
- { call: "cursor.continue('c')", result: null },
-
- // Called w/ index key and primary key:
- { call: "cursor.continuePrimaryKey('a', 3)", result: {key: 'a', primaryKey: 3} },
- { call: "cursor.continuePrimaryKey('a', 4)", result: {key: 'b', primaryKey: 1} },
- { call: "cursor.continuePrimaryKey('b', 1)", result: {key: 'b', primaryKey: 1} },
- { call: "cursor.continuePrimaryKey('b', 4)", result: {key: 'b', primaryKey: 4} },
- { call: "cursor.continuePrimaryKey('b', 5)", result: null },
- { call: "cursor.continuePrimaryKey('c', 1)", result: null },
-
- // Called w/ primary key but w/o index key
- { call: "cursor.continuePrimaryKey(null, 1)", exception: 'DataError' },
- { call: "cursor.continuePrimaryKey(null, 2)", exception: 'DataError' },
- { call: "cursor.continuePrimaryKey(null, 3)", exception: 'DataError' },
- { call: "cursor.continuePrimaryKey(null, 4)", exception: 'DataError' },
- { call: "cursor.continuePrimaryKey(null, 5)", exception: 'DataError' },
-
- // Called w/ index key but w/o primary key
- { call: "cursor.continuePrimaryKey('a', null)", exception: 'DataError' },
- ];
-
-function verifyContinueCalls() {
- debug("");
- if (!testCases.length) {
- finishJSTest();
- return;
- }
-
- var quiet = true;
- testCase = testCases.shift();
- debug("Test case: " + testCase.call);
- debug("");
- evalAndLog("tx = db.transaction('store')");
- evalAndLog("request = tx.objectStore('store').index('index').openCursor()");
- var i = 0;
- request.onsuccess = function() {
- ++i;
- evalAndLog("cursor = request.result", true);
- if (i === 1) {
- if ('exception' in testCase) {
- evalAndExpectException(testCase.call, "0", "'DataError'");
- } else {
- evalAndLog(testCase.call);
- }
- return;
- }
-
- if (i === 2) {
- if (testCase.result) {
- shouldBe("cursor.key", JSON.stringify(testCase.result.key));
- shouldBe("cursor.primaryKey", JSON.stringify(testCase.result.primaryKey));
- } else {
- shouldBeNull("cursor");
- }
- }
- };
-
- tx.oncomplete = verifyContinueCalls;
-}
</del></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbresourcesfactorybasicsjs"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/storage/indexeddb/resources/factory-basics.js (193659 => 193660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/resources/factory-basics.js 2015-12-07 23:15:54 UTC (rev 193659)
+++ trunk/LayoutTests/storage/indexeddb/resources/factory-basics.js 2015-12-07 23:43:38 UTC (rev 193660)
</span><span class="lines">@@ -1,90 +0,0 @@
</span><del>-if (this.importScripts) {
- importScripts('../../../resources/js-test.js');
- importScripts('shared.js');
-}
-
-description("Test the basics of IndexedDB's IDBFactory.");
-
-function test()
-{
- removeVendorPrefixes();
-
- shouldBeEqualToString("typeof indexedDB.open", "function");
- shouldBeEqualToString("typeof indexedDB.cmp", "function");
- shouldBeEqualToString("typeof indexedDB.deleteDatabase", "function");
-
- // Non-standard, must be prefixed
- shouldBeEqualToString("typeof indexedDB.webkitGetDatabaseNames", "function");
- shouldBeEqualToString("typeof indexedDB.getDatabaseNames", "undefined");
-
- name = 'storage/indexeddb/factory-basics';
-
- evalAndLog("request = indexedDB.webkitGetDatabaseNames()");
- shouldBeNull("request.source");
- request.onsuccess = getDatabaseNamesSuccess1;
- request.onerror = unexpectedErrorCallback;
-}
-
-function getDatabaseNamesSuccess1(evt)
-{
- event = evt;
- var databaseNames;
- evalAndLog("databaseNames = event.target.result");
- shouldBeFalse("databaseNames.contains('" + name + "')");
- shouldBeFalse("databaseNames.contains('DATABASE THAT DOES NOT EXIST')");
-
- evalAndLog("request = indexedDB.open(name)");
- shouldBeNull("request.source");
- request.onsuccess = openSuccess;
- request.onerror = unexpectedErrorCallback;
-}
-
-function openSuccess(evt)
-{
- event = evt;
- evalAndLog("event.target.result.close()");
- request = evalAndLog("indexedDB.webkitGetDatabaseNames()");
- request.onsuccess = getDatabaseNamesSuccess2;
- request.onerror = unexpectedErrorCallback;
-}
-
-function getDatabaseNamesSuccess2(evt)
-{
- event = evt;
- var databaseNames;
- evalAndLog("databaseNames = event.target.result");
- shouldBeTrue("databaseNames.contains('" + name + "')");
- shouldBeFalse("databaseNames.contains('DATABASE THAT DOES NOT EXIST')");
-
- evalAndLog("request = indexedDB.deleteDatabase('" + name + "')");
- shouldBeNull("request.source");
- request.onsuccess = deleteDatabaseSuccess;
- request.onerror = unexpectedErrorCallback;
-}
-
-function deleteDatabaseSuccess()
-{
- request = evalAndLog("indexedDB.webkitGetDatabaseNames()");
- request.onsuccess = getDatabaseNamesSuccess3;
- request.onerror = unexpectedErrorCallback;
-}
-
-function getDatabaseNamesSuccess3(evt)
-{
- event = evt;
- var databaseNames;
- evalAndLog("databaseNames = event.target.result");
- shouldBeFalse("databaseNames.contains('" + name + "')");
- shouldBeFalse("databaseNames.contains('DATABASE THAT DOES NOT EXIST')");
-
- request = evalAndLog("indexedDB.deleteDatabase('DATABASE THAT DOES NOT EXIST')");
- request.onsuccess = deleteDatabaseSuccess2;
- request.onerror = unexpectedErrorCallback;
-}
-
-function deleteDatabaseSuccess2()
-{
- finishJSTest();
-}
-
-test();
</del></span></pre>
</div>
</div>
</body>
</html>