<!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>[195321] 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/195321">195321</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-01-19 15:41:11 -0800 (Tue, 19 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modern IDB: Split all storage/indexeddb/modern tests into separate HTML + JS format.
https://bugs.webkit.org/show_bug.cgi?id=153251
Reviewed by Sam Weinig.
* storage/indexeddb/modern/abort-requests-cancelled-expected.txt:
* storage/indexeddb/modern/abort-requests-cancelled.html:
* storage/indexeddb/modern/aborted-put-expected.txt:
* storage/indexeddb/modern/aborted-put.html:
* storage/indexeddb/modern/autoincrement-abort-expected.txt:
* storage/indexeddb/modern/autoincrement-abort.html:
* storage/indexeddb/modern/basic-add-expected.txt:
* storage/indexeddb/modern/basic-add.html:
* storage/indexeddb/modern/basic-put-expected.txt:
* storage/indexeddb/modern/basic-put.html:
* storage/indexeddb/modern/create-index-failures-expected.txt:
* storage/indexeddb/modern/create-index-failures.html:
* storage/indexeddb/modern/createobjectstore-basic-expected.txt:
* storage/indexeddb/modern/createobjectstore-basic.html:
* storage/indexeddb/modern/createobjectstore-failures-expected.txt:
* storage/indexeddb/modern/createobjectstore-failures.html:
* storage/indexeddb/modern/cursor-1-expected.txt:
* storage/indexeddb/modern/cursor-1.html:
* storage/indexeddb/modern/cursor-2-expected.txt:
* storage/indexeddb/modern/cursor-2.html:
* storage/indexeddb/modern/cursor-3-expected.txt:
* storage/indexeddb/modern/cursor-3.html:
* storage/indexeddb/modern/cursor-4-expected.txt:
* storage/indexeddb/modern/cursor-4.html:
* storage/indexeddb/modern/cursor-5-expected.txt:
* storage/indexeddb/modern/cursor-5.html:
* storage/indexeddb/modern/cursor-6-expected.txt:
* storage/indexeddb/modern/cursor-6.html:
* storage/indexeddb/modern/cursor-7-expected.txt:
* storage/indexeddb/modern/cursor-7.html:
* storage/indexeddb/modern/cursor-8-expected.txt:
* storage/indexeddb/modern/cursor-8.html:
* storage/indexeddb/modern/date-basic-expected.txt:
* storage/indexeddb/modern/date-basic.html:
* storage/indexeddb/modern/deletedatabase-1-expected.txt:
* storage/indexeddb/modern/deletedatabase-1.html:
* storage/indexeddb/modern/deletedatabase-2-expected.txt:
* storage/indexeddb/modern/deletedatabase-2.html:
* storage/indexeddb/modern/deletedatabase-null-name-exception-expected.txt:
* storage/indexeddb/modern/deletedatabase-null-name-exception.html:
* storage/indexeddb/modern/deletedatabase-request-event-expected.txt:
* storage/indexeddb/modern/deletedatabase-request-event.html:
* storage/indexeddb/modern/deletedatabase-request-expected.txt:
* storage/indexeddb/modern/deletedatabase-request.html:
* storage/indexeddb/modern/deleteindex-1-expected.txt:
* storage/indexeddb/modern/deleteindex-1.html:
* storage/indexeddb/modern/deleteindex-2-expected.txt:
* storage/indexeddb/modern/deleteindex-2.html:
* storage/indexeddb/modern/deleteobjectstore-1-expected.txt:
* storage/indexeddb/modern/deleteobjectstore-1.html:
* storage/indexeddb/modern/double-abort-expected.txt:
* storage/indexeddb/modern/double-abort.html:
* storage/indexeddb/modern/double-open-expected.txt:
* storage/indexeddb/modern/double-open.html:
* storage/indexeddb/modern/get-index-failures-expected.txt:
* storage/indexeddb/modern/get-index-failures.html:
* storage/indexeddb/modern/get-keyrange-expected.txt:
* storage/indexeddb/modern/get-keyrange.html:
* storage/indexeddb/modern/idbdatabase-deleteobjectstore-failures-expected.txt:
* storage/indexeddb/modern/idbdatabase-deleteobjectstore-failures.html:
* storage/indexeddb/modern/idbdatabase-transaction-failures-expected.txt:
* storage/indexeddb/modern/idbdatabase-transaction-failures.html:
* storage/indexeddb/modern/idbindex-properties-basic-expected.txt:
* storage/indexeddb/modern/idbindex-properties-basic.html:
* storage/indexeddb/modern/idbobjectstore-clear-1-expected.txt:
* storage/indexeddb/modern/idbobjectstore-clear-1.html:
* storage/indexeddb/modern/idbobjectstore-clear-2-expected.txt:
* storage/indexeddb/modern/idbobjectstore-clear-2.html:
* storage/indexeddb/modern/idbobjectstore-count-1-expected.txt:
* storage/indexeddb/modern/idbobjectstore-count-1.html:
* storage/indexeddb/modern/idbobjectstore-count-failures-expected.txt:
* storage/indexeddb/modern/idbobjectstore-count-failures.html:
* storage/indexeddb/modern/idbobjectstore-delete-1-expected.txt:
* storage/indexeddb/modern/idbobjectstore-delete-1.html:
* storage/indexeddb/modern/idbobjectstore-delete-2-expected.txt:
* storage/indexeddb/modern/idbobjectstore-delete-2.html:
* storage/indexeddb/modern/idbobjectstore-delete-failures-expected.txt:
* storage/indexeddb/modern/idbobjectstore-delete-failures.html:
* storage/indexeddb/modern/idbobjectstore-get-failures-expected.txt:
* storage/indexeddb/modern/idbobjectstore-get-failures.html:
* storage/indexeddb/modern/idbobjectstore-put-and-clear-failures-expected.txt:
* storage/indexeddb/modern/idbobjectstore-put-and-clear-failures.html:
* storage/indexeddb/modern/idbtransaction-objectstore-failures-expected.txt:
* storage/indexeddb/modern/idbtransaction-objectstore-failures.html:
* storage/indexeddb/modern/index-1-expected.txt:
* storage/indexeddb/modern/index-1.html:
* storage/indexeddb/modern/index-2-expected.txt:
* storage/indexeddb/modern/index-2.html:
* storage/indexeddb/modern/index-3-expected.txt:
* storage/indexeddb/modern/index-3.html:
* storage/indexeddb/modern/index-4-expected.txt:
* storage/indexeddb/modern/index-4.html:
* storage/indexeddb/modern/index-5-expected.txt:
* storage/indexeddb/modern/index-5.html:
* storage/indexeddb/modern/index-cursor-1-expected.txt:
* storage/indexeddb/modern/index-cursor-1.html:
* storage/indexeddb/modern/index-cursor-2-expected.txt:
* storage/indexeddb/modern/index-cursor-2.html:
* storage/indexeddb/modern/index-cursor-3-expected.txt:
* storage/indexeddb/modern/index-cursor-3.html:
* storage/indexeddb/modern/index-get-count-basic-expected.txt:
* storage/indexeddb/modern/index-get-count-basic.html:
* storage/indexeddb/modern/index-get-count-failures-expected.txt:
* storage/indexeddb/modern/index-get-count-failures.html:
* storage/indexeddb/modern/keypath-basic-expected.txt:
* storage/indexeddb/modern/keypath-basic.html:
* storage/indexeddb/modern/objectstore-attributes-expected.txt:
* storage/indexeddb/modern/objectstore-attributes.html:
* storage/indexeddb/modern/objectstore-cursor-advance-failures-expected.txt:
* storage/indexeddb/modern/objectstore-cursor-advance-failures.html:
* storage/indexeddb/modern/objectstore-cursor-continue-failures-expected.txt:
* storage/indexeddb/modern/objectstore-cursor-continue-failures.html:
* storage/indexeddb/modern/opencursor-failures-expected.txt:
* storage/indexeddb/modern/opencursor-failures.html:
* storage/indexeddb/modern/opendatabase-request-event-expected.txt:
* storage/indexeddb/modern/opendatabase-request-event.html:
* storage/indexeddb/modern/opendatabase-request-expected.txt:
* storage/indexeddb/modern/opendatabase-request.html:
* storage/indexeddb/modern/opendatabase-success-after-versionchange-expected.txt:
* storage/indexeddb/modern/opendatabase-success-after-versionchange.html:
* storage/indexeddb/modern/opendatabase-versions-expected.txt:
* storage/indexeddb/modern/opendatabase-versions.html:
* storage/indexeddb/modern/request-readystate-expected.txt:
* storage/indexeddb/modern/request-readystate.html:
* storage/indexeddb/modern/resources/abort-requests-cancelled.js: Copied from LayoutTests/storage/indexeddb/modern/abort-requests-cancelled.html.
* storage/indexeddb/modern/resources/aborted-put.js: Copied from LayoutTests/storage/indexeddb/modern/aborted-put.html.
* storage/indexeddb/modern/resources/autoincrement-abort.js: Copied from LayoutTests/storage/indexeddb/modern/autoincrement-abort.html.
* storage/indexeddb/modern/resources/basic-add.js: Copied from LayoutTests/storage/indexeddb/modern/basic-add.html.
* storage/indexeddb/modern/resources/basic-put.js: Copied from LayoutTests/storage/indexeddb/modern/basic-put.html.
* storage/indexeddb/modern/resources/create-index-failures.js: Copied from LayoutTests/storage/indexeddb/modern/create-index-failures.html.
* storage/indexeddb/modern/resources/createobjectstore-basic.js: Copied from LayoutTests/storage/indexeddb/modern/createobjectstore-basic.html.
* storage/indexeddb/modern/resources/createobjectstore-failures.js: Copied from LayoutTests/storage/indexeddb/modern/createobjectstore-failures.html.
* storage/indexeddb/modern/resources/cursor-1.js: Copied from LayoutTests/storage/indexeddb/modern/cursor-1.html.
* storage/indexeddb/modern/resources/cursor-2.js: Copied from LayoutTests/storage/indexeddb/modern/cursor-2.html.
* storage/indexeddb/modern/resources/cursor-3.js: Copied from LayoutTests/storage/indexeddb/modern/cursor-3.html.
* storage/indexeddb/modern/resources/cursor-4.js: Copied from LayoutTests/storage/indexeddb/modern/cursor-4.html.
* storage/indexeddb/modern/resources/cursor-5.js: Copied from LayoutTests/storage/indexeddb/modern/cursor-5.html.
* storage/indexeddb/modern/resources/cursor-6.js: Copied from LayoutTests/storage/indexeddb/modern/cursor-6.html.
* storage/indexeddb/modern/resources/cursor-7.js: Copied from LayoutTests/storage/indexeddb/modern/cursor-7.html.
* storage/indexeddb/modern/resources/cursor-8.js: Copied from LayoutTests/storage/indexeddb/modern/cursor-8.html.
* storage/indexeddb/modern/resources/date-basic.js: Copied from LayoutTests/storage/indexeddb/modern/date-basic.html.
* storage/indexeddb/modern/resources/deletedatabase-1.js: Copied from LayoutTests/storage/indexeddb/modern/deletedatabase-1.html.
* storage/indexeddb/modern/resources/deletedatabase-2.js: Copied from LayoutTests/storage/indexeddb/modern/deletedatabase-2.html.
* storage/indexeddb/modern/resources/deletedatabase-null-name-exception.js: Added.
* storage/indexeddb/modern/resources/deletedatabase-request-event.js: Copied from LayoutTests/storage/indexeddb/modern/deletedatabase-request-event.html.
* storage/indexeddb/modern/resources/deletedatabase-request.js: Added.
* storage/indexeddb/modern/resources/deleteindex-1.js: Copied from LayoutTests/storage/indexeddb/modern/deleteindex-1.html.
* storage/indexeddb/modern/resources/deleteindex-2.js: Copied from LayoutTests/storage/indexeddb/modern/deleteindex-2.html.
* storage/indexeddb/modern/resources/deleteobjectstore-1.js: Copied from LayoutTests/storage/indexeddb/modern/deleteobjectstore-1.html.
* storage/indexeddb/modern/resources/double-abort.js: Copied from LayoutTests/storage/indexeddb/modern/double-abort.html.
* storage/indexeddb/modern/resources/double-open.js: Added.
* storage/indexeddb/modern/resources/get-index-failures.js: Copied from LayoutTests/storage/indexeddb/modern/get-index-failures.html.
* storage/indexeddb/modern/resources/get-keyrange.js: Copied from LayoutTests/storage/indexeddb/modern/get-keyrange.html.
* storage/indexeddb/modern/resources/idbdatabase-deleteobjectstore-failures.js: Copied from LayoutTests/storage/indexeddb/modern/idbdatabase-deleteobjectstore-failures.html.
* storage/indexeddb/modern/resources/idbdatabase-transaction-failures.js: Copied from LayoutTests/storage/indexeddb/modern/idbdatabase-transaction-failures.html.
* storage/indexeddb/modern/resources/idbindex-properties-basic.js: Copied from LayoutTests/storage/indexeddb/modern/idbindex-properties-basic.html.
* storage/indexeddb/modern/resources/idbobjectstore-clear-1.js: Copied from LayoutTests/storage/indexeddb/modern/idbobjectstore-clear-1.html.
* storage/indexeddb/modern/resources/idbobjectstore-clear-2.js: Copied from LayoutTests/storage/indexeddb/modern/idbobjectstore-clear-2.html.
* storage/indexeddb/modern/resources/idbobjectstore-count-1.js: Copied from LayoutTests/storage/indexeddb/modern/idbobjectstore-count-1.html.
* storage/indexeddb/modern/resources/idbobjectstore-count-failures.js: Copied from LayoutTests/storage/indexeddb/modern/idbobjectstore-count-failures.html.
* storage/indexeddb/modern/resources/idbobjectstore-delete-1.js: Copied from LayoutTests/storage/indexeddb/modern/idbobjectstore-delete-1.html.
* storage/indexeddb/modern/resources/idbobjectstore-delete-2.js: Copied from LayoutTests/storage/indexeddb/modern/idbobjectstore-delete-2.html.
* storage/indexeddb/modern/resources/idbobjectstore-delete-failures.js: Copied from LayoutTests/storage/indexeddb/modern/idbobjectstore-delete-failures.html.
* storage/indexeddb/modern/resources/idbobjectstore-get-failures.js: Copied from LayoutTests/storage/indexeddb/modern/idbobjectstore-get-failures.html.
* storage/indexeddb/modern/resources/idbobjectstore-put-and-clear-failures.js: Copied from LayoutTests/storage/indexeddb/modern/idbobjectstore-put-and-clear-failures.html.
* storage/indexeddb/modern/resources/idbtransaction-objectstore-failures.js: Added.
* storage/indexeddb/modern/resources/index-1.js: Copied from LayoutTests/storage/indexeddb/modern/index-1.html.
* storage/indexeddb/modern/resources/index-2.js: Copied from LayoutTests/storage/indexeddb/modern/index-2.html.
* storage/indexeddb/modern/resources/index-3.js: Copied from LayoutTests/storage/indexeddb/modern/index-3.html.
* storage/indexeddb/modern/resources/index-4.js: Copied from LayoutTests/storage/indexeddb/modern/index-4.html.
* storage/indexeddb/modern/resources/index-5.js: Copied from LayoutTests/storage/indexeddb/modern/index-5.html.
* storage/indexeddb/modern/resources/index-cursor-1.js: Copied from LayoutTests/storage/indexeddb/modern/index-cursor-1.html.
* storage/indexeddb/modern/resources/index-cursor-2.js: Copied from LayoutTests/storage/indexeddb/modern/index-cursor-2.html.
* storage/indexeddb/modern/resources/index-cursor-3.js: Copied from LayoutTests/storage/indexeddb/modern/index-cursor-3.html.
* storage/indexeddb/modern/resources/index-get-count-basic.js: Copied from LayoutTests/storage/indexeddb/modern/index-get-count-basic.html.
* storage/indexeddb/modern/resources/index-get-count-failures.js: Copied from LayoutTests/storage/indexeddb/modern/index-get-count-failures.html.
* storage/indexeddb/modern/resources/keypath-basic.js: Copied from LayoutTests/storage/indexeddb/modern/keypath-basic.html.
* storage/indexeddb/modern/resources/objectstore-attributes.js: Copied from LayoutTests/storage/indexeddb/modern/objectstore-attributes.html.
* storage/indexeddb/modern/resources/objectstore-cursor-advance-failures.js: Copied from LayoutTests/storage/indexeddb/modern/objectstore-cursor-advance-failures.html.
* storage/indexeddb/modern/resources/objectstore-cursor-continue-failures.js: Copied from LayoutTests/storage/indexeddb/modern/objectstore-cursor-continue-failures.html.
* storage/indexeddb/modern/resources/opencursor-failures.js: Copied from LayoutTests/storage/indexeddb/modern/opencursor-failures.html.
* storage/indexeddb/modern/resources/opendatabase-request-event.js: Added.
* storage/indexeddb/modern/resources/opendatabase-request.js: Copied from LayoutTests/storage/indexeddb/modern/opendatabase-request.html.
* storage/indexeddb/modern/resources/opendatabase-success-after-versionchange.js: Copied from LayoutTests/storage/indexeddb/modern/opendatabase-success-after-versionchange.html.
* storage/indexeddb/modern/resources/opendatabase-versions.js: Copied from LayoutTests/storage/indexeddb/modern/opendatabase-versions.html.
* storage/indexeddb/modern/resources/request-readystate.js: Added.
* storage/indexeddb/modern/resources/transaction-scheduler-1.js: Copied from LayoutTests/storage/indexeddb/modern/transaction-scheduler-1.html.
* storage/indexeddb/modern/resources/transaction-scheduler-2.js: Copied from LayoutTests/storage/indexeddb/modern/transaction-scheduler-2.html.
* storage/indexeddb/modern/resources/transaction-scheduler-3.js: Copied from LayoutTests/storage/indexeddb/modern/transaction-scheduler-3.html.
* storage/indexeddb/modern/resources/transaction-scheduler-5.js: Copied from LayoutTests/storage/indexeddb/modern/transaction-scheduler-5.html.
* storage/indexeddb/modern/resources/transaction-scheduler-6.js: Copied from LayoutTests/storage/indexeddb/modern/transaction-scheduler-6.html.
* storage/indexeddb/modern/resources/transactions-stop-on-navigation-2.html:
* storage/indexeddb/modern/resources/versionchange-abort-then-reopen.js: Copied from LayoutTests/storage/indexeddb/modern/versionchange-abort-then-reopen.html.
* storage/indexeddb/modern/resources/versionchange-event.js: Copied from LayoutTests/storage/indexeddb/modern/versionchange-event.html.
* storage/indexeddb/modern/transaction-scheduler-1-expected.txt:
* storage/indexeddb/modern/transaction-scheduler-1.html:
* storage/indexeddb/modern/transaction-scheduler-2-expected.txt:
* storage/indexeddb/modern/transaction-scheduler-2.html:
* storage/indexeddb/modern/transaction-scheduler-3-expected.txt:
* storage/indexeddb/modern/transaction-scheduler-3.html:
* storage/indexeddb/modern/transaction-scheduler-5-expected.txt:
* storage/indexeddb/modern/transaction-scheduler-5.html:
* storage/indexeddb/modern/transaction-scheduler-6-expected.txt:
* storage/indexeddb/modern/transaction-scheduler-6.html:
* storage/indexeddb/modern/transactions-stop-on-navigation-expected.txt:
* storage/indexeddb/modern/versionchange-abort-then-reopen-expected.txt:
* storage/indexeddb/modern/versionchange-abort-then-reopen.html:
* storage/indexeddb/modern/versionchange-event-expected.txt:
* storage/indexeddb/modern/versionchange-event.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernabortrequestscancelledexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/abort-requests-cancelled-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernabortrequestscancelledhtml">trunk/LayoutTests/storage/indexeddb/modern/abort-requests-cancelled.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernabortedputexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/aborted-put-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernabortedputhtml">trunk/LayoutTests/storage/indexeddb/modern/aborted-put.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernautoincrementabortexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/autoincrement-abort-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernautoincrementaborthtml">trunk/LayoutTests/storage/indexeddb/modern/autoincrement-abort.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernbasicaddexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/basic-add-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernbasicaddhtml">trunk/LayoutTests/storage/indexeddb/modern/basic-add.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernbasicputexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/basic-put-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernbasicputhtml">trunk/LayoutTests/storage/indexeddb/modern/basic-put.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderncreateindexfailuresexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/create-index-failures-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderncreateindexfailureshtml">trunk/LayoutTests/storage/indexeddb/modern/create-index-failures.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderncreateobjectstorebasicexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/createobjectstore-basic-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderncreateobjectstorebasichtml">trunk/LayoutTests/storage/indexeddb/modern/createobjectstore-basic.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderncreateobjectstorefailuresexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/createobjectstore-failures-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderncreateobjectstorefailureshtml">trunk/LayoutTests/storage/indexeddb/modern/createobjectstore-failures.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderncursor1expectedtxt">trunk/LayoutTests/storage/indexeddb/modern/cursor-1-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderncursor1html">trunk/LayoutTests/storage/indexeddb/modern/cursor-1.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderncursor2expectedtxt">trunk/LayoutTests/storage/indexeddb/modern/cursor-2-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderncursor2html">trunk/LayoutTests/storage/indexeddb/modern/cursor-2.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderncursor3expectedtxt">trunk/LayoutTests/storage/indexeddb/modern/cursor-3-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderncursor3html">trunk/LayoutTests/storage/indexeddb/modern/cursor-3.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderncursor4expectedtxt">trunk/LayoutTests/storage/indexeddb/modern/cursor-4-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderncursor4html">trunk/LayoutTests/storage/indexeddb/modern/cursor-4.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderncursor5expectedtxt">trunk/LayoutTests/storage/indexeddb/modern/cursor-5-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderncursor5html">trunk/LayoutTests/storage/indexeddb/modern/cursor-5.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderncursor6expectedtxt">trunk/LayoutTests/storage/indexeddb/modern/cursor-6-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderncursor6html">trunk/LayoutTests/storage/indexeddb/modern/cursor-6.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderncursor7expectedtxt">trunk/LayoutTests/storage/indexeddb/modern/cursor-7-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderncursor7html">trunk/LayoutTests/storage/indexeddb/modern/cursor-7.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderncursor8expectedtxt">trunk/LayoutTests/storage/indexeddb/modern/cursor-8-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderncursor8html">trunk/LayoutTests/storage/indexeddb/modern/cursor-8.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderndatebasicexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/date-basic-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderndatebasichtml">trunk/LayoutTests/storage/indexeddb/modern/date-basic.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderndeletedatabase1expectedtxt">trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-1-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderndeletedatabase1html">trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-1.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderndeletedatabase2expectedtxt">trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-2-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderndeletedatabase2html">trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-2.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderndeletedatabasenullnameexceptionexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-null-name-exception-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderndeletedatabasenullnameexceptionhtml">trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-null-name-exception.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderndeletedatabaserequesteventexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-request-event-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderndeletedatabaserequesteventhtml">trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-request-event.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderndeletedatabaserequestexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-request-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderndeletedatabaserequesthtml">trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-request.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderndeleteindex1expectedtxt">trunk/LayoutTests/storage/indexeddb/modern/deleteindex-1-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderndeleteindex1html">trunk/LayoutTests/storage/indexeddb/modern/deleteindex-1.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderndeleteindex2expectedtxt">trunk/LayoutTests/storage/indexeddb/modern/deleteindex-2-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderndeleteindex2html">trunk/LayoutTests/storage/indexeddb/modern/deleteindex-2.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderndeleteobjectstore1expectedtxt">trunk/LayoutTests/storage/indexeddb/modern/deleteobjectstore-1-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderndeleteobjectstore1html">trunk/LayoutTests/storage/indexeddb/modern/deleteobjectstore-1.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderndoubleabortexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/double-abort-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderndoubleaborthtml">trunk/LayoutTests/storage/indexeddb/modern/double-abort.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderndoubleopenexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/double-open-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderndoubleopenhtml">trunk/LayoutTests/storage/indexeddb/modern/double-open.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderngetindexfailuresexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/get-index-failures-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderngetindexfailureshtml">trunk/LayoutTests/storage/indexeddb/modern/get-index-failures.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderngetkeyrangeexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/get-keyrange-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderngetkeyrangehtml">trunk/LayoutTests/storage/indexeddb/modern/get-keyrange.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernidbdatabasedeleteobjectstorefailuresexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/idbdatabase-deleteobjectstore-failures-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernidbdatabasedeleteobjectstorefailureshtml">trunk/LayoutTests/storage/indexeddb/modern/idbdatabase-deleteobjectstore-failures.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernidbdatabasetransactionfailuresexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/idbdatabase-transaction-failures-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernidbdatabasetransactionfailureshtml">trunk/LayoutTests/storage/indexeddb/modern/idbdatabase-transaction-failures.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernidbindexpropertiesbasicexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/idbindex-properties-basic-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernidbindexpropertiesbasichtml">trunk/LayoutTests/storage/indexeddb/modern/idbindex-properties-basic.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernidbobjectstoreclear1expectedtxt">trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-clear-1-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernidbobjectstoreclear1html">trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-clear-1.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernidbobjectstoreclear2expectedtxt">trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-clear-2-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernidbobjectstoreclear2html">trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-clear-2.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernidbobjectstorecount1expectedtxt">trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-count-1-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernidbobjectstorecount1html">trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-count-1.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernidbobjectstorecountfailuresexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-count-failures-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernidbobjectstorecountfailureshtml">trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-count-failures.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernidbobjectstoredelete1expectedtxt">trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-delete-1-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernidbobjectstoredelete1html">trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-delete-1.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernidbobjectstoredelete2expectedtxt">trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-delete-2-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernidbobjectstoredelete2html">trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-delete-2.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernidbobjectstoredeletefailuresexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-delete-failures-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernidbobjectstoredeletefailureshtml">trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-delete-failures.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernidbobjectstoregetfailuresexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-get-failures-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernidbobjectstoregetfailureshtml">trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-get-failures.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernidbobjectstoreputandclearfailuresexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-put-and-clear-failures-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernidbobjectstoreputandclearfailureshtml">trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-put-and-clear-failures.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernidbtransactionobjectstorefailuresexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/idbtransaction-objectstore-failures-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernidbtransactionobjectstorefailureshtml">trunk/LayoutTests/storage/indexeddb/modern/idbtransaction-objectstore-failures.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernindex1expectedtxt">trunk/LayoutTests/storage/indexeddb/modern/index-1-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernindex1html">trunk/LayoutTests/storage/indexeddb/modern/index-1.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernindex2expectedtxt">trunk/LayoutTests/storage/indexeddb/modern/index-2-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernindex2html">trunk/LayoutTests/storage/indexeddb/modern/index-2.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernindex3expectedtxt">trunk/LayoutTests/storage/indexeddb/modern/index-3-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernindex3html">trunk/LayoutTests/storage/indexeddb/modern/index-3.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernindex4expectedtxt">trunk/LayoutTests/storage/indexeddb/modern/index-4-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernindex4html">trunk/LayoutTests/storage/indexeddb/modern/index-4.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernindex5expectedtxt">trunk/LayoutTests/storage/indexeddb/modern/index-5-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernindex5html">trunk/LayoutTests/storage/indexeddb/modern/index-5.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernindexcursor1expectedtxt">trunk/LayoutTests/storage/indexeddb/modern/index-cursor-1-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernindexcursor1html">trunk/LayoutTests/storage/indexeddb/modern/index-cursor-1.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernindexcursor2expectedtxt">trunk/LayoutTests/storage/indexeddb/modern/index-cursor-2-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernindexcursor2html">trunk/LayoutTests/storage/indexeddb/modern/index-cursor-2.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernindexcursor3expectedtxt">trunk/LayoutTests/storage/indexeddb/modern/index-cursor-3-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernindexcursor3html">trunk/LayoutTests/storage/indexeddb/modern/index-cursor-3.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernindexgetcountbasicexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/index-get-count-basic-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernindexgetcountbasichtml">trunk/LayoutTests/storage/indexeddb/modern/index-get-count-basic.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernindexgetcountfailuresexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/index-get-count-failures-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernindexgetcountfailureshtml">trunk/LayoutTests/storage/indexeddb/modern/index-get-count-failures.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernkeypathbasicexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/keypath-basic-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernkeypathbasichtml">trunk/LayoutTests/storage/indexeddb/modern/keypath-basic.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernobjectstoreattributesexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/objectstore-attributes-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernobjectstoreattributeshtml">trunk/LayoutTests/storage/indexeddb/modern/objectstore-attributes.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernobjectstorecursoradvancefailuresexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/objectstore-cursor-advance-failures-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernobjectstorecursoradvancefailureshtml">trunk/LayoutTests/storage/indexeddb/modern/objectstore-cursor-advance-failures.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernobjectstorecursorcontinuefailuresexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/objectstore-cursor-continue-failures-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernobjectstorecursorcontinuefailureshtml">trunk/LayoutTests/storage/indexeddb/modern/objectstore-cursor-continue-failures.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernopencursorfailuresexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/opencursor-failures-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernopencursorfailureshtml">trunk/LayoutTests/storage/indexeddb/modern/opencursor-failures.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernopendatabaserequesteventexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/opendatabase-request-event-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernopendatabaserequesteventhtml">trunk/LayoutTests/storage/indexeddb/modern/opendatabase-request-event.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernopendatabaserequestexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/opendatabase-request-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernopendatabaserequesthtml">trunk/LayoutTests/storage/indexeddb/modern/opendatabase-request.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernopendatabasesuccessafterversionchangeexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/opendatabase-success-after-versionchange-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernopendatabasesuccessafterversionchangehtml">trunk/LayoutTests/storage/indexeddb/modern/opendatabase-success-after-versionchange.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernopendatabaseversionsexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/opendatabase-versions-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernopendatabaseversionshtml">trunk/LayoutTests/storage/indexeddb/modern/opendatabase-versions.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernrequestreadystateexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/request-readystate-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernrequestreadystatehtml">trunk/LayoutTests/storage/indexeddb/modern/request-readystate.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcestransactionsstoponnavigation2html">trunk/LayoutTests/storage/indexeddb/modern/resources/transactions-stop-on-navigation-2.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderntransactionscheduler1expectedtxt">trunk/LayoutTests/storage/indexeddb/modern/transaction-scheduler-1-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderntransactionscheduler1html">trunk/LayoutTests/storage/indexeddb/modern/transaction-scheduler-1.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderntransactionscheduler2expectedtxt">trunk/LayoutTests/storage/indexeddb/modern/transaction-scheduler-2-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderntransactionscheduler2html">trunk/LayoutTests/storage/indexeddb/modern/transaction-scheduler-2.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderntransactionscheduler3expectedtxt">trunk/LayoutTests/storage/indexeddb/modern/transaction-scheduler-3-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderntransactionscheduler3html">trunk/LayoutTests/storage/indexeddb/modern/transaction-scheduler-3.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderntransactionscheduler5expectedtxt">trunk/LayoutTests/storage/indexeddb/modern/transaction-scheduler-5-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderntransactionscheduler5html">trunk/LayoutTests/storage/indexeddb/modern/transaction-scheduler-5.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderntransactionscheduler6expectedtxt">trunk/LayoutTests/storage/indexeddb/modern/transaction-scheduler-6-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderntransactionscheduler6html">trunk/LayoutTests/storage/indexeddb/modern/transaction-scheduler-6.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmoderntransactionsstoponnavigationexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/transactions-stop-on-navigation-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernversionchangeabortthenreopenexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/versionchange-abort-then-reopen-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernversionchangeabortthenreopenhtml">trunk/LayoutTests/storage/indexeddb/modern/versionchange-abort-then-reopen.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernversionchangeeventexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/versionchange-event-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernversionchangeeventhtml">trunk/LayoutTests/storage/indexeddb/modern/versionchange-event.html</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesabortrequestscancelledjs">trunk/LayoutTests/storage/indexeddb/modern/resources/abort-requests-cancelled.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesabortedputjs">trunk/LayoutTests/storage/indexeddb/modern/resources/aborted-put.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesautoincrementabortjs">trunk/LayoutTests/storage/indexeddb/modern/resources/autoincrement-abort.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesbasicaddjs">trunk/LayoutTests/storage/indexeddb/modern/resources/basic-add.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesbasicputjs">trunk/LayoutTests/storage/indexeddb/modern/resources/basic-put.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcescreateindexfailuresjs">trunk/LayoutTests/storage/indexeddb/modern/resources/create-index-failures.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcescreateobjectstorebasicjs">trunk/LayoutTests/storage/indexeddb/modern/resources/createobjectstore-basic.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcescreateobjectstorefailuresjs">trunk/LayoutTests/storage/indexeddb/modern/resources/createobjectstore-failures.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcescursor1js">trunk/LayoutTests/storage/indexeddb/modern/resources/cursor-1.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcescursor2js">trunk/LayoutTests/storage/indexeddb/modern/resources/cursor-2.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcescursor3js">trunk/LayoutTests/storage/indexeddb/modern/resources/cursor-3.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcescursor4js">trunk/LayoutTests/storage/indexeddb/modern/resources/cursor-4.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcescursor5js">trunk/LayoutTests/storage/indexeddb/modern/resources/cursor-5.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcescursor6js">trunk/LayoutTests/storage/indexeddb/modern/resources/cursor-6.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcescursor7js">trunk/LayoutTests/storage/indexeddb/modern/resources/cursor-7.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcescursor8js">trunk/LayoutTests/storage/indexeddb/modern/resources/cursor-8.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesdatebasicjs">trunk/LayoutTests/storage/indexeddb/modern/resources/date-basic.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesdeletedatabase1js">trunk/LayoutTests/storage/indexeddb/modern/resources/deletedatabase-1.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesdeletedatabase2js">trunk/LayoutTests/storage/indexeddb/modern/resources/deletedatabase-2.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesdeletedatabasenullnameexceptionjs">trunk/LayoutTests/storage/indexeddb/modern/resources/deletedatabase-null-name-exception.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesdeletedatabaserequesteventjs">trunk/LayoutTests/storage/indexeddb/modern/resources/deletedatabase-request-event.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesdeletedatabaserequestjs">trunk/LayoutTests/storage/indexeddb/modern/resources/deletedatabase-request.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesdeleteindex1js">trunk/LayoutTests/storage/indexeddb/modern/resources/deleteindex-1.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesdeleteindex2js">trunk/LayoutTests/storage/indexeddb/modern/resources/deleteindex-2.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesdeleteobjectstore1js">trunk/LayoutTests/storage/indexeddb/modern/resources/deleteobjectstore-1.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesdoubleabortjs">trunk/LayoutTests/storage/indexeddb/modern/resources/double-abort.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesdoubleopenjs">trunk/LayoutTests/storage/indexeddb/modern/resources/double-open.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesgetindexfailuresjs">trunk/LayoutTests/storage/indexeddb/modern/resources/get-index-failures.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesgetkeyrangejs">trunk/LayoutTests/storage/indexeddb/modern/resources/get-keyrange.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesidbdatabasedeleteobjectstorefailuresjs">trunk/LayoutTests/storage/indexeddb/modern/resources/idbdatabase-deleteobjectstore-failures.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesidbdatabasetransactionfailuresjs">trunk/LayoutTests/storage/indexeddb/modern/resources/idbdatabase-transaction-failures.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesidbindexpropertiesbasicjs">trunk/LayoutTests/storage/indexeddb/modern/resources/idbindex-properties-basic.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesidbobjectstoreclear1js">trunk/LayoutTests/storage/indexeddb/modern/resources/idbobjectstore-clear-1.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesidbobjectstoreclear2js">trunk/LayoutTests/storage/indexeddb/modern/resources/idbobjectstore-clear-2.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesidbobjectstorecount1js">trunk/LayoutTests/storage/indexeddb/modern/resources/idbobjectstore-count-1.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesidbobjectstorecountfailuresjs">trunk/LayoutTests/storage/indexeddb/modern/resources/idbobjectstore-count-failures.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesidbobjectstoredelete1js">trunk/LayoutTests/storage/indexeddb/modern/resources/idbobjectstore-delete-1.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesidbobjectstoredelete2js">trunk/LayoutTests/storage/indexeddb/modern/resources/idbobjectstore-delete-2.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesidbobjectstoredeletefailuresjs">trunk/LayoutTests/storage/indexeddb/modern/resources/idbobjectstore-delete-failures.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesidbobjectstoregetfailuresjs">trunk/LayoutTests/storage/indexeddb/modern/resources/idbobjectstore-get-failures.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesidbobjectstoreputandclearfailuresjs">trunk/LayoutTests/storage/indexeddb/modern/resources/idbobjectstore-put-and-clear-failures.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesidbtransactionobjectstorefailuresjs">trunk/LayoutTests/storage/indexeddb/modern/resources/idbtransaction-objectstore-failures.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesindex1js">trunk/LayoutTests/storage/indexeddb/modern/resources/index-1.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesindex2js">trunk/LayoutTests/storage/indexeddb/modern/resources/index-2.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesindex3js">trunk/LayoutTests/storage/indexeddb/modern/resources/index-3.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesindex4js">trunk/LayoutTests/storage/indexeddb/modern/resources/index-4.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesindex5js">trunk/LayoutTests/storage/indexeddb/modern/resources/index-5.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesindexcursor1js">trunk/LayoutTests/storage/indexeddb/modern/resources/index-cursor-1.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesindexcursor2js">trunk/LayoutTests/storage/indexeddb/modern/resources/index-cursor-2.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesindexcursor3js">trunk/LayoutTests/storage/indexeddb/modern/resources/index-cursor-3.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesindexgetcountbasicjs">trunk/LayoutTests/storage/indexeddb/modern/resources/index-get-count-basic.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesindexgetcountfailuresjs">trunk/LayoutTests/storage/indexeddb/modern/resources/index-get-count-failures.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourceskeypathbasicjs">trunk/LayoutTests/storage/indexeddb/modern/resources/keypath-basic.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesobjectstoreattributesjs">trunk/LayoutTests/storage/indexeddb/modern/resources/objectstore-attributes.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesobjectstorecursoradvancefailuresjs">trunk/LayoutTests/storage/indexeddb/modern/resources/objectstore-cursor-advance-failures.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesobjectstorecursorcontinuefailuresjs">trunk/LayoutTests/storage/indexeddb/modern/resources/objectstore-cursor-continue-failures.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesopencursorfailuresjs">trunk/LayoutTests/storage/indexeddb/modern/resources/opencursor-failures.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesopendatabaserequesteventjs">trunk/LayoutTests/storage/indexeddb/modern/resources/opendatabase-request-event.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesopendatabaserequestjs">trunk/LayoutTests/storage/indexeddb/modern/resources/opendatabase-request.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesopendatabasesuccessafterversionchangejs">trunk/LayoutTests/storage/indexeddb/modern/resources/opendatabase-success-after-versionchange.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesopendatabaseversionsjs">trunk/LayoutTests/storage/indexeddb/modern/resources/opendatabase-versions.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesrequestreadystatejs">trunk/LayoutTests/storage/indexeddb/modern/resources/request-readystate.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcestransactionscheduler1js">trunk/LayoutTests/storage/indexeddb/modern/resources/transaction-scheduler-1.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcestransactionscheduler2js">trunk/LayoutTests/storage/indexeddb/modern/resources/transaction-scheduler-2.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcestransactionscheduler3js">trunk/LayoutTests/storage/indexeddb/modern/resources/transaction-scheduler-3.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcestransactionscheduler5js">trunk/LayoutTests/storage/indexeddb/modern/resources/transaction-scheduler-5.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcestransactionscheduler6js">trunk/LayoutTests/storage/indexeddb/modern/resources/transaction-scheduler-6.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesversionchangeabortthenreopenjs">trunk/LayoutTests/storage/indexeddb/modern/resources/versionchange-abort-then-reopen.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesversionchangeeventjs">trunk/LayoutTests/storage/indexeddb/modern/resources/versionchange-event.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/ChangeLog 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,3 +1,220 @@
</span><ins>+2016-01-19 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: Split all storage/indexeddb/modern tests into separate HTML + JS format.
+ https://bugs.webkit.org/show_bug.cgi?id=153251
+
+ Reviewed by Sam Weinig.
+
+ * storage/indexeddb/modern/abort-requests-cancelled-expected.txt:
+ * storage/indexeddb/modern/abort-requests-cancelled.html:
+ * storage/indexeddb/modern/aborted-put-expected.txt:
+ * storage/indexeddb/modern/aborted-put.html:
+ * storage/indexeddb/modern/autoincrement-abort-expected.txt:
+ * storage/indexeddb/modern/autoincrement-abort.html:
+ * storage/indexeddb/modern/basic-add-expected.txt:
+ * storage/indexeddb/modern/basic-add.html:
+ * storage/indexeddb/modern/basic-put-expected.txt:
+ * storage/indexeddb/modern/basic-put.html:
+ * storage/indexeddb/modern/create-index-failures-expected.txt:
+ * storage/indexeddb/modern/create-index-failures.html:
+ * storage/indexeddb/modern/createobjectstore-basic-expected.txt:
+ * storage/indexeddb/modern/createobjectstore-basic.html:
+ * storage/indexeddb/modern/createobjectstore-failures-expected.txt:
+ * storage/indexeddb/modern/createobjectstore-failures.html:
+ * storage/indexeddb/modern/cursor-1-expected.txt:
+ * storage/indexeddb/modern/cursor-1.html:
+ * storage/indexeddb/modern/cursor-2-expected.txt:
+ * storage/indexeddb/modern/cursor-2.html:
+ * storage/indexeddb/modern/cursor-3-expected.txt:
+ * storage/indexeddb/modern/cursor-3.html:
+ * storage/indexeddb/modern/cursor-4-expected.txt:
+ * storage/indexeddb/modern/cursor-4.html:
+ * storage/indexeddb/modern/cursor-5-expected.txt:
+ * storage/indexeddb/modern/cursor-5.html:
+ * storage/indexeddb/modern/cursor-6-expected.txt:
+ * storage/indexeddb/modern/cursor-6.html:
+ * storage/indexeddb/modern/cursor-7-expected.txt:
+ * storage/indexeddb/modern/cursor-7.html:
+ * storage/indexeddb/modern/cursor-8-expected.txt:
+ * storage/indexeddb/modern/cursor-8.html:
+ * storage/indexeddb/modern/date-basic-expected.txt:
+ * storage/indexeddb/modern/date-basic.html:
+ * storage/indexeddb/modern/deletedatabase-1-expected.txt:
+ * storage/indexeddb/modern/deletedatabase-1.html:
+ * storage/indexeddb/modern/deletedatabase-2-expected.txt:
+ * storage/indexeddb/modern/deletedatabase-2.html:
+ * storage/indexeddb/modern/deletedatabase-null-name-exception-expected.txt:
+ * storage/indexeddb/modern/deletedatabase-null-name-exception.html:
+ * storage/indexeddb/modern/deletedatabase-request-event-expected.txt:
+ * storage/indexeddb/modern/deletedatabase-request-event.html:
+ * storage/indexeddb/modern/deletedatabase-request-expected.txt:
+ * storage/indexeddb/modern/deletedatabase-request.html:
+ * storage/indexeddb/modern/deleteindex-1-expected.txt:
+ * storage/indexeddb/modern/deleteindex-1.html:
+ * storage/indexeddb/modern/deleteindex-2-expected.txt:
+ * storage/indexeddb/modern/deleteindex-2.html:
+ * storage/indexeddb/modern/deleteobjectstore-1-expected.txt:
+ * storage/indexeddb/modern/deleteobjectstore-1.html:
+ * storage/indexeddb/modern/double-abort-expected.txt:
+ * storage/indexeddb/modern/double-abort.html:
+ * storage/indexeddb/modern/double-open-expected.txt:
+ * storage/indexeddb/modern/double-open.html:
+ * storage/indexeddb/modern/get-index-failures-expected.txt:
+ * storage/indexeddb/modern/get-index-failures.html:
+ * storage/indexeddb/modern/get-keyrange-expected.txt:
+ * storage/indexeddb/modern/get-keyrange.html:
+ * storage/indexeddb/modern/idbdatabase-deleteobjectstore-failures-expected.txt:
+ * storage/indexeddb/modern/idbdatabase-deleteobjectstore-failures.html:
+ * storage/indexeddb/modern/idbdatabase-transaction-failures-expected.txt:
+ * storage/indexeddb/modern/idbdatabase-transaction-failures.html:
+ * storage/indexeddb/modern/idbindex-properties-basic-expected.txt:
+ * storage/indexeddb/modern/idbindex-properties-basic.html:
+ * storage/indexeddb/modern/idbobjectstore-clear-1-expected.txt:
+ * storage/indexeddb/modern/idbobjectstore-clear-1.html:
+ * storage/indexeddb/modern/idbobjectstore-clear-2-expected.txt:
+ * storage/indexeddb/modern/idbobjectstore-clear-2.html:
+ * storage/indexeddb/modern/idbobjectstore-count-1-expected.txt:
+ * storage/indexeddb/modern/idbobjectstore-count-1.html:
+ * storage/indexeddb/modern/idbobjectstore-count-failures-expected.txt:
+ * storage/indexeddb/modern/idbobjectstore-count-failures.html:
+ * storage/indexeddb/modern/idbobjectstore-delete-1-expected.txt:
+ * storage/indexeddb/modern/idbobjectstore-delete-1.html:
+ * storage/indexeddb/modern/idbobjectstore-delete-2-expected.txt:
+ * storage/indexeddb/modern/idbobjectstore-delete-2.html:
+ * storage/indexeddb/modern/idbobjectstore-delete-failures-expected.txt:
+ * storage/indexeddb/modern/idbobjectstore-delete-failures.html:
+ * storage/indexeddb/modern/idbobjectstore-get-failures-expected.txt:
+ * storage/indexeddb/modern/idbobjectstore-get-failures.html:
+ * storage/indexeddb/modern/idbobjectstore-put-and-clear-failures-expected.txt:
+ * storage/indexeddb/modern/idbobjectstore-put-and-clear-failures.html:
+ * storage/indexeddb/modern/idbtransaction-objectstore-failures-expected.txt:
+ * storage/indexeddb/modern/idbtransaction-objectstore-failures.html:
+ * storage/indexeddb/modern/index-1-expected.txt:
+ * storage/indexeddb/modern/index-1.html:
+ * storage/indexeddb/modern/index-2-expected.txt:
+ * storage/indexeddb/modern/index-2.html:
+ * storage/indexeddb/modern/index-3-expected.txt:
+ * storage/indexeddb/modern/index-3.html:
+ * storage/indexeddb/modern/index-4-expected.txt:
+ * storage/indexeddb/modern/index-4.html:
+ * storage/indexeddb/modern/index-5-expected.txt:
+ * storage/indexeddb/modern/index-5.html:
+ * storage/indexeddb/modern/index-cursor-1-expected.txt:
+ * storage/indexeddb/modern/index-cursor-1.html:
+ * storage/indexeddb/modern/index-cursor-2-expected.txt:
+ * storage/indexeddb/modern/index-cursor-2.html:
+ * storage/indexeddb/modern/index-cursor-3-expected.txt:
+ * storage/indexeddb/modern/index-cursor-3.html:
+ * storage/indexeddb/modern/index-get-count-basic-expected.txt:
+ * storage/indexeddb/modern/index-get-count-basic.html:
+ * storage/indexeddb/modern/index-get-count-failures-expected.txt:
+ * storage/indexeddb/modern/index-get-count-failures.html:
+ * storage/indexeddb/modern/keypath-basic-expected.txt:
+ * storage/indexeddb/modern/keypath-basic.html:
+ * storage/indexeddb/modern/objectstore-attributes-expected.txt:
+ * storage/indexeddb/modern/objectstore-attributes.html:
+ * storage/indexeddb/modern/objectstore-cursor-advance-failures-expected.txt:
+ * storage/indexeddb/modern/objectstore-cursor-advance-failures.html:
+ * storage/indexeddb/modern/objectstore-cursor-continue-failures-expected.txt:
+ * storage/indexeddb/modern/objectstore-cursor-continue-failures.html:
+ * storage/indexeddb/modern/opencursor-failures-expected.txt:
+ * storage/indexeddb/modern/opencursor-failures.html:
+ * storage/indexeddb/modern/opendatabase-request-event-expected.txt:
+ * storage/indexeddb/modern/opendatabase-request-event.html:
+ * storage/indexeddb/modern/opendatabase-request-expected.txt:
+ * storage/indexeddb/modern/opendatabase-request.html:
+ * storage/indexeddb/modern/opendatabase-success-after-versionchange-expected.txt:
+ * storage/indexeddb/modern/opendatabase-success-after-versionchange.html:
+ * storage/indexeddb/modern/opendatabase-versions-expected.txt:
+ * storage/indexeddb/modern/opendatabase-versions.html:
+ * storage/indexeddb/modern/request-readystate-expected.txt:
+ * storage/indexeddb/modern/request-readystate.html:
+ * storage/indexeddb/modern/resources/abort-requests-cancelled.js: Copied from LayoutTests/storage/indexeddb/modern/abort-requests-cancelled.html.
+ * storage/indexeddb/modern/resources/aborted-put.js: Copied from LayoutTests/storage/indexeddb/modern/aborted-put.html.
+ * storage/indexeddb/modern/resources/autoincrement-abort.js: Copied from LayoutTests/storage/indexeddb/modern/autoincrement-abort.html.
+ * storage/indexeddb/modern/resources/basic-add.js: Copied from LayoutTests/storage/indexeddb/modern/basic-add.html.
+ * storage/indexeddb/modern/resources/basic-put.js: Copied from LayoutTests/storage/indexeddb/modern/basic-put.html.
+ * storage/indexeddb/modern/resources/create-index-failures.js: Copied from LayoutTests/storage/indexeddb/modern/create-index-failures.html.
+ * storage/indexeddb/modern/resources/createobjectstore-basic.js: Copied from LayoutTests/storage/indexeddb/modern/createobjectstore-basic.html.
+ * storage/indexeddb/modern/resources/createobjectstore-failures.js: Copied from LayoutTests/storage/indexeddb/modern/createobjectstore-failures.html.
+ * storage/indexeddb/modern/resources/cursor-1.js: Copied from LayoutTests/storage/indexeddb/modern/cursor-1.html.
+ * storage/indexeddb/modern/resources/cursor-2.js: Copied from LayoutTests/storage/indexeddb/modern/cursor-2.html.
+ * storage/indexeddb/modern/resources/cursor-3.js: Copied from LayoutTests/storage/indexeddb/modern/cursor-3.html.
+ * storage/indexeddb/modern/resources/cursor-4.js: Copied from LayoutTests/storage/indexeddb/modern/cursor-4.html.
+ * storage/indexeddb/modern/resources/cursor-5.js: Copied from LayoutTests/storage/indexeddb/modern/cursor-5.html.
+ * storage/indexeddb/modern/resources/cursor-6.js: Copied from LayoutTests/storage/indexeddb/modern/cursor-6.html.
+ * storage/indexeddb/modern/resources/cursor-7.js: Copied from LayoutTests/storage/indexeddb/modern/cursor-7.html.
+ * storage/indexeddb/modern/resources/cursor-8.js: Copied from LayoutTests/storage/indexeddb/modern/cursor-8.html.
+ * storage/indexeddb/modern/resources/date-basic.js: Copied from LayoutTests/storage/indexeddb/modern/date-basic.html.
+ * storage/indexeddb/modern/resources/deletedatabase-1.js: Copied from LayoutTests/storage/indexeddb/modern/deletedatabase-1.html.
+ * storage/indexeddb/modern/resources/deletedatabase-2.js: Copied from LayoutTests/storage/indexeddb/modern/deletedatabase-2.html.
+ * storage/indexeddb/modern/resources/deletedatabase-null-name-exception.js: Added.
+ * storage/indexeddb/modern/resources/deletedatabase-request-event.js: Copied from LayoutTests/storage/indexeddb/modern/deletedatabase-request-event.html.
+ * storage/indexeddb/modern/resources/deletedatabase-request.js: Added.
+ * storage/indexeddb/modern/resources/deleteindex-1.js: Copied from LayoutTests/storage/indexeddb/modern/deleteindex-1.html.
+ * storage/indexeddb/modern/resources/deleteindex-2.js: Copied from LayoutTests/storage/indexeddb/modern/deleteindex-2.html.
+ * storage/indexeddb/modern/resources/deleteobjectstore-1.js: Copied from LayoutTests/storage/indexeddb/modern/deleteobjectstore-1.html.
+ * storage/indexeddb/modern/resources/double-abort.js: Copied from LayoutTests/storage/indexeddb/modern/double-abort.html.
+ * storage/indexeddb/modern/resources/double-open.js: Added.
+ * storage/indexeddb/modern/resources/get-index-failures.js: Copied from LayoutTests/storage/indexeddb/modern/get-index-failures.html.
+ * storage/indexeddb/modern/resources/get-keyrange.js: Copied from LayoutTests/storage/indexeddb/modern/get-keyrange.html.
+ * storage/indexeddb/modern/resources/idbdatabase-deleteobjectstore-failures.js: Copied from LayoutTests/storage/indexeddb/modern/idbdatabase-deleteobjectstore-failures.html.
+ * storage/indexeddb/modern/resources/idbdatabase-transaction-failures.js: Copied from LayoutTests/storage/indexeddb/modern/idbdatabase-transaction-failures.html.
+ * storage/indexeddb/modern/resources/idbindex-properties-basic.js: Copied from LayoutTests/storage/indexeddb/modern/idbindex-properties-basic.html.
+ * storage/indexeddb/modern/resources/idbobjectstore-clear-1.js: Copied from LayoutTests/storage/indexeddb/modern/idbobjectstore-clear-1.html.
+ * storage/indexeddb/modern/resources/idbobjectstore-clear-2.js: Copied from LayoutTests/storage/indexeddb/modern/idbobjectstore-clear-2.html.
+ * storage/indexeddb/modern/resources/idbobjectstore-count-1.js: Copied from LayoutTests/storage/indexeddb/modern/idbobjectstore-count-1.html.
+ * storage/indexeddb/modern/resources/idbobjectstore-count-failures.js: Copied from LayoutTests/storage/indexeddb/modern/idbobjectstore-count-failures.html.
+ * storage/indexeddb/modern/resources/idbobjectstore-delete-1.js: Copied from LayoutTests/storage/indexeddb/modern/idbobjectstore-delete-1.html.
+ * storage/indexeddb/modern/resources/idbobjectstore-delete-2.js: Copied from LayoutTests/storage/indexeddb/modern/idbobjectstore-delete-2.html.
+ * storage/indexeddb/modern/resources/idbobjectstore-delete-failures.js: Copied from LayoutTests/storage/indexeddb/modern/idbobjectstore-delete-failures.html.
+ * storage/indexeddb/modern/resources/idbobjectstore-get-failures.js: Copied from LayoutTests/storage/indexeddb/modern/idbobjectstore-get-failures.html.
+ * storage/indexeddb/modern/resources/idbobjectstore-put-and-clear-failures.js: Copied from LayoutTests/storage/indexeddb/modern/idbobjectstore-put-and-clear-failures.html.
+ * storage/indexeddb/modern/resources/idbtransaction-objectstore-failures.js: Added.
+ * storage/indexeddb/modern/resources/index-1.js: Copied from LayoutTests/storage/indexeddb/modern/index-1.html.
+ * storage/indexeddb/modern/resources/index-2.js: Copied from LayoutTests/storage/indexeddb/modern/index-2.html.
+ * storage/indexeddb/modern/resources/index-3.js: Copied from LayoutTests/storage/indexeddb/modern/index-3.html.
+ * storage/indexeddb/modern/resources/index-4.js: Copied from LayoutTests/storage/indexeddb/modern/index-4.html.
+ * storage/indexeddb/modern/resources/index-5.js: Copied from LayoutTests/storage/indexeddb/modern/index-5.html.
+ * storage/indexeddb/modern/resources/index-cursor-1.js: Copied from LayoutTests/storage/indexeddb/modern/index-cursor-1.html.
+ * storage/indexeddb/modern/resources/index-cursor-2.js: Copied from LayoutTests/storage/indexeddb/modern/index-cursor-2.html.
+ * storage/indexeddb/modern/resources/index-cursor-3.js: Copied from LayoutTests/storage/indexeddb/modern/index-cursor-3.html.
+ * storage/indexeddb/modern/resources/index-get-count-basic.js: Copied from LayoutTests/storage/indexeddb/modern/index-get-count-basic.html.
+ * storage/indexeddb/modern/resources/index-get-count-failures.js: Copied from LayoutTests/storage/indexeddb/modern/index-get-count-failures.html.
+ * storage/indexeddb/modern/resources/keypath-basic.js: Copied from LayoutTests/storage/indexeddb/modern/keypath-basic.html.
+ * storage/indexeddb/modern/resources/objectstore-attributes.js: Copied from LayoutTests/storage/indexeddb/modern/objectstore-attributes.html.
+ * storage/indexeddb/modern/resources/objectstore-cursor-advance-failures.js: Copied from LayoutTests/storage/indexeddb/modern/objectstore-cursor-advance-failures.html.
+ * storage/indexeddb/modern/resources/objectstore-cursor-continue-failures.js: Copied from LayoutTests/storage/indexeddb/modern/objectstore-cursor-continue-failures.html.
+ * storage/indexeddb/modern/resources/opencursor-failures.js: Copied from LayoutTests/storage/indexeddb/modern/opencursor-failures.html.
+ * storage/indexeddb/modern/resources/opendatabase-request-event.js: Added.
+ * storage/indexeddb/modern/resources/opendatabase-request.js: Copied from LayoutTests/storage/indexeddb/modern/opendatabase-request.html.
+ * storage/indexeddb/modern/resources/opendatabase-success-after-versionchange.js: Copied from LayoutTests/storage/indexeddb/modern/opendatabase-success-after-versionchange.html.
+ * storage/indexeddb/modern/resources/opendatabase-versions.js: Copied from LayoutTests/storage/indexeddb/modern/opendatabase-versions.html.
+ * storage/indexeddb/modern/resources/request-readystate.js: Added.
+ * storage/indexeddb/modern/resources/transaction-scheduler-1.js: Copied from LayoutTests/storage/indexeddb/modern/transaction-scheduler-1.html.
+ * storage/indexeddb/modern/resources/transaction-scheduler-2.js: Copied from LayoutTests/storage/indexeddb/modern/transaction-scheduler-2.html.
+ * storage/indexeddb/modern/resources/transaction-scheduler-3.js: Copied from LayoutTests/storage/indexeddb/modern/transaction-scheduler-3.html.
+ * storage/indexeddb/modern/resources/transaction-scheduler-5.js: Copied from LayoutTests/storage/indexeddb/modern/transaction-scheduler-5.html.
+ * storage/indexeddb/modern/resources/transaction-scheduler-6.js: Copied from LayoutTests/storage/indexeddb/modern/transaction-scheduler-6.html.
+ * storage/indexeddb/modern/resources/transactions-stop-on-navigation-2.html:
+ * storage/indexeddb/modern/resources/versionchange-abort-then-reopen.js: Copied from LayoutTests/storage/indexeddb/modern/versionchange-abort-then-reopen.html.
+ * storage/indexeddb/modern/resources/versionchange-event.js: Copied from LayoutTests/storage/indexeddb/modern/versionchange-event.html.
+ * storage/indexeddb/modern/transaction-scheduler-1-expected.txt:
+ * storage/indexeddb/modern/transaction-scheduler-1.html:
+ * storage/indexeddb/modern/transaction-scheduler-2-expected.txt:
+ * storage/indexeddb/modern/transaction-scheduler-2.html:
+ * storage/indexeddb/modern/transaction-scheduler-3-expected.txt:
+ * storage/indexeddb/modern/transaction-scheduler-3.html:
+ * storage/indexeddb/modern/transaction-scheduler-5-expected.txt:
+ * storage/indexeddb/modern/transaction-scheduler-5.html:
+ * storage/indexeddb/modern/transaction-scheduler-6-expected.txt:
+ * storage/indexeddb/modern/transaction-scheduler-6.html:
+ * storage/indexeddb/modern/transactions-stop-on-navigation-expected.txt:
+ * storage/indexeddb/modern/versionchange-abort-then-reopen-expected.txt:
+ * storage/indexeddb/modern/versionchange-abort-then-reopen.html:
+ * storage/indexeddb/modern/versionchange-event-expected.txt:
+ * storage/indexeddb/modern/versionchange-event.html:
+
</ins><span class="cx"> 2016-01-19 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> outline-offset does not work for inlines.
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernabortrequestscancelledexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/abort-requests-cancelled-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/abort-requests-cancelled-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/abort-requests-cancelled-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,4 +1,8 @@
</span><span class="cx"> This test makes sure that un-handled requests in a transaction receive onerror callbacks when the transaction is aborted.
</span><ins>+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> Error handling: "objectStore.put({ bar: 'A' }, 1);" (error)
</span><span class="cx"> Error handling: "objectStore.put({ bar: 'B' }, 2);" (error)
</span><span class="lines">@@ -20,5 +24,7 @@
</span><span class="cx"> Error handling: "objectStore.get(2);" (error)
</span><span class="cx"> Error handling: "objectStore.get(3);" (error)
</span><span class="cx"> readonly transaction aborted
</span><del>-Done
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernabortrequestscancelledhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/abort-requests-cancelled.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/abort-requests-cancelled.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/abort-requests-cancelled.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,156 +1,10 @@
</span><del>-This test makes sure that un-handled requests in a transaction receive onerror callbacks when the transaction is aborted.<br>
-<div id="logger"></div>
-<script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
</ins><span class="cx">
</span><del>-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- log("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-function log(message)
-{
- document.getElementById("logger").innerHTML += message + "<br>";
-}
-
-var database;
-var objectStore;
-
-function setupRequest(code)
-{
- var request = eval(code);
- request.onsuccess = function()
- {
- log ("Success handling: \"" + code + "\"");
- }
- request.onerror = function(e)
- {
- log ("Error handling: \"" + code + "\" (" + e.type + ")");
- e.stopPropagation();
- }
-}
-
-startTest();
-
-function startTest() {
- var createRequest = window.indexedDB.open("AbortRequestsCancelledDatabase", 1);
- createRequest.onupgradeneeded = function(event) {
- log("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- var database = event.target.result;
- objectStore = database.createObjectStore("TestObjectStore");
- setupRequest("objectStore.put({ bar: 'A' }, 1);");
- setupRequest("objectStore.put({ bar: 'B' }, 2);");
- setupRequest("objectStore.put({ bar: 'C' }, 3);");
-
- versionTransaction.abort();
-
- versionTransaction.onabort = function(event) {
- log("Initial upgrade versionchange transaction aborted");
- database.close();
- continueTest1();
- }
-
- versionTransaction.oncomplete = function(event) {
- log("Initial upgrade versionchange transaction unexpected complete");
- done();
- }
-
- versionTransaction.onerror = function(event) {
- log("Initial upgrade versionchange transaction error " + event);
- }
- }
-}
-
-function continueTest1() {
- var createRequest = window.indexedDB.open("AbortRequestsCancelledDatabase", 1);
- createRequest.onupgradeneeded = function(event) {
- log("Second upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- database = event.target.result;
- objectStore = database.createObjectStore("TestObjectStore");
-
- setupRequest("objectStore.put({ bar: 'A' }, 1);");
- setupRequest("objectStore.put({ bar: 'B' }, 2);");
- setupRequest("objectStore.put({ bar: 'C' }, 3);");
-
- versionTransaction.onabort = function(event) {
- log("Second upgrade versionchange transaction unexpected abort");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- log("Second upgrade versionchange transaction completed");
- continueTest2();
- }
-
- versionTransaction.onerror = function(event) {
- log("Second upgrade versionchange transaction unexpected error" + event);
- done();
- }
- }
-}
-
-function continueTest2() {
- var transaction = database.transaction("TestObjectStore", "readwrite");
- objectStore = transaction.objectStore("TestObjectStore");
-
- setupRequest("objectStore.get(1);");
- setupRequest("objectStore.get(2);");
- setupRequest("objectStore.get(3);");
- setupRequest("objectStore.put({ bar: 'D' }, 4);");
- setupRequest("objectStore.put({ bar: 'E' }, 5);");
- setupRequest("objectStore.put({ bar: 'F' }, 6);");
-
- transaction.abort();
-
- transaction.onabort = function(event) {
- log("readwrite transaction aborted");
- continueTest3();
- }
-
- transaction.oncomplete = function(event) {
- log("readwrite transaction unexpected complete");
- done();
- }
-
- transaction.onerror = function(event) {
- log("readwrite transaction unexpected error" + event);
- done();
- }
-}
-
-function continueTest3() {
- var transaction = database.transaction("TestObjectStore", "readonly");
- objectStore = transaction.objectStore("TestObjectStore");
-
- setupRequest("objectStore.get(1);");
- setupRequest("objectStore.get(2);");
- setupRequest("objectStore.get(3);");
-
- transaction.abort();
-
- transaction.onabort = function(event) {
- log("readonly transaction aborted");
- done();
- }
-
- transaction.oncomplete = function(event) {
- log("readwrite transaction unexpected complete");
- done();
- }
-
- transaction.onerror = function(event) {
- log("readwrite transaction unexpected error" + event);
- done();
- }
-}
-</script>
</del><ins>+<script src="resources/abort-requests-cancelled.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernabortedputexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/aborted-put-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/aborted-put-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/aborted-put-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,3 +1,8 @@
</span><ins>+This test creates some object stores, putting some values in them, committing the transaction. In a new transaction, it then overwrites those values, but then aborts the transaction. Finally it verifies everything is set up from the first transaction, and nothing from the aborted one committed.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> ALERT: First upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> ALERT: [object IDBTransaction] - versionchange
</span><span class="cx"> ALERT: [object IDBDatabase]
</span><span class="lines">@@ -17,8 +22,7 @@
</span><span class="cx"> ALERT: get1 'foo' succeeded - value was 'bar'
</span><span class="cx"> ALERT: get2 'far' succeeded - value was 'undefined'
</span><span class="cx"> ALERT: Third version change transaction complete
</span><del>-ALERT: Done
-This test creates some object stores, putting some values in them, committing the transaction.
-In a new transaction, it then overwrites those values, but then aborts the transaction.
-Finally it verifies everything is set up from the first transaction, and nothing from the aborted one committed.
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernabortedputhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/aborted-put.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/aborted-put.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/aborted-put.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,203 +1,9 @@
</span><del>-This test creates some object stores, putting some values in them, committing the transaction.<br>
-In a new transaction, it then overwrites those values, but then aborts the transaction.<br>
-Finally it verifies everything is set up from the first transaction, and nothing from the aborted one committed.<br>
-<script>
-
-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-var request = window.indexedDB.open("AbortedPutTestDatabase");
-
-function done()
-{
- alert("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-request.onupgradeneeded = function(event)
-{
- alert("First upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var tx = request.transaction;
- var db = event.target.result;
-
- alert(tx + " - " + tx.mode);
- alert(db);
-
- var os1 = db.createObjectStore("TestObjectStore1");
- var os2 = db.createObjectStore("TestObjectStore2");
-
- var putRequest = os1.put("bar", "foo");
-
- putRequest.onsuccess = function(event) {
- alert("put succeeded - key was '" + putRequest.result + "'");
-
- var getRequest1 = os1.get("foo");
- getRequest1.onsuccess = function(event) {
- alert("get 'foo' succeeded - value was '" + getRequest1.result + "'");
- }
-
- getRequest1.onerror = function(event) {
- alert("get 'foo' unexpectedly failed - " + event);
- done();
- }
-
- var getRequest2 = os2.get("far");
- getRequest2.onsuccess = function(event) {
- alert("get 'far' succeeded - value was '" + getRequest2.result + "'");
- }
-
- getRequest2.onerror = function(event) {
- alert("get 'far' unexpectedly failed - " + event);
- done();
- }
- }
-
- putRequest.onerror = function(event) {
- alert("put unexpectedly failed - " + event);
- done();
- }
-
- tx.onabort = function(event) {
- alert("First version change transaction unexpected abort");
- done();
- }
-
- tx.oncomplete = function(event) {
- alert("First version change transaction completed");
- db.close();
- continueTest1();
- }
-
- tx.onerror = function(event) {
- alert("First version change transaction unexpected error - " + event);
- done();
- }
-}
-
-function continueTest1()
-{
- var request = window.indexedDB.open("AbortedPutTestDatabase", 2);
-
- request.onupgradeneeded = function(event) {
- alert("Second upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var tx = request.transaction;
- var db = event.target.result;
-
- alert(tx + " - " + tx.mode);
- alert(db);
-
- var os1 = tx.objectStore("TestObjectStore1");
- var os2 = tx.objectStore("TestObjectStore2");
- var putRequest1 = os1.put("baz", "foo");
- var putRequest2 = os2.put("boo", "far");
-
- putRequest1.onerror = function(e) {
- alert("Unexpected error overwriting bar with baz - " + e);
- done();
- }
-
- putRequest2.onerror = function(e) {
- alert("Writing into second object store unexpectedly failed - " + e);
- done();
- }
-
- putRequest2.onsuccess = function(e) {
- var getRequest1 = os1.get("foo");
- var getRequest2 = os2.get("far");
-
- getRequest1.onsuccess = function(event) {
- alert("get1 'foo' succeeded - value was '" + getRequest1.result + "'");
- }
-
- getRequest1.onerror = function(event) {
- alert("get1 unexpectedly failed - " + event);
- done();
- }
-
- getRequest2.onsuccess = function(event) {
- alert("get2 'far' succeeded - value was '" + getRequest2.result + "'");
- tx.abort();
- }
-
- getRequest2.onerror = function(event) {
- alert("get2 unexpectedly failed - " + event);
- done();
- }
- }
-
- tx.onabort = function(event) {
- alert("Second version change transaction abort");
- db.close();
- continueTest2();
- }
-
- tx.oncomplete = function(event) {
- alert("Second version change transaction unexpected complete");
- done();
- }
-
- tx.onerror = function(event) {
- alert("Second version change transaction error - " + event);
- }
- }
-}
-
-function continueTest2()
-{
- var request = window.indexedDB.open("AbortedPutTestDatabase", 2);
-
- request.onupgradeneeded = function(event) {
- alert("Third upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var tx = request.transaction;
- var db = event.target.result;
-
- alert(tx + " - " + tx.mode);
- alert(db);
-
- var os1 = tx.objectStore("TestObjectStore1");
- var os2 = tx.objectStore("TestObjectStore2");
- var getRequest1 = os1.get("foo");
- var getRequest2 = os2.get("far");
-
- getRequest1.onsuccess = function(event) {
- alert("get1 'foo' succeeded - value was '" + getRequest1.result + "'");
- }
-
- getRequest1.onerror = function(event) {
- alert("get1 'foo' unexpectedly failed - " + event);
- done();
- }
-
- getRequest2.onsuccess = function(event) {
- alert("get2 'far' succeeded - value was '" + getRequest2.result + "'");
- }
-
- getRequest2.onerror = function(event) {
- alert("get2 'far' unexpectedly failed - " + event);
- done();
- }
-
- tx.onabort = function(event) {
- alert("Third version change transaction unexpected abort");
- done();
- }
-
- tx.oncomplete = function(event) {
- alert("Third version change transaction complete");
- done();
- }
-
- tx.onerror = function(event) {
- alert("Third version change transaction unexpected error - " + event);
- done();
- }
- }
-}
-
-</script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
+<script src="resources/aborted-put.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernautoincrementabortexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/autoincrement-abort-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/autoincrement-abort-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/autoincrement-abort-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,3 +1,8 @@
</span><ins>+This test creates a new database with an objectstore that autoincrements. It then puts some things in that object store, checking the keys that were used. But it then aborts that transaction. Then it opens a new one and puts something in it, double checking that the key generator was reverted when the above transaction was aborted.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> ALERT: Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> ALERT: Initial upgrade versionchange transaction complete
</span><span class="cx"> ALERT: Opening readwrite transaction to bump the key generator, but it will be aborted
</span><span class="lines">@@ -24,9 +29,7 @@
</span><span class="cx"> ALERT: Key used for put was 11
</span><span class="cx"> ALERT: Key used for put was 12
</span><span class="cx"> ALERT: readwrite transaction complete
</span><del>-ALERT: Done
-This test creates a new database with an objectstore that autoincrements.
-It then puts some things in that object store, checking the keys that were used.
-But it then aborts that transaction.
-Then it opens a new one and puts something in it, double checking that the key generator was reverted when the above transaction was aborted.
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernautoincrementaborthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/autoincrement-abort.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/autoincrement-abort.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/autoincrement-abort.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,159 +1,9 @@
</span><del>-This test creates a new database with an objectstore that autoincrements.<br>
-It then puts some things in that object store, checking the keys that were used.<br>
-But it then aborts that transaction.<br>
-Then it opens a new one and puts something in it, double checking that the key generator was reverted when the above transaction was aborted.<br>
-<script>
-
-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- alert("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-var createRequest = window.indexedDB.open("AutoincrementAbortDatabase", 1);
-var database;
-
-createRequest.onupgradeneeded = function(event) {
- alert("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- database = event.target.result;
- var objectStore = database.createObjectStore('TestObjectStore', { autoIncrement: true });
-
- versionTransaction.onabort = function(event) {
- alert("Initial upgrade versionchange transaction unexpected abort");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- alert("Initial upgrade versionchange transaction complete");
- continueTest1();
- }
-
- versionTransaction.onerror = function(event) {
- alert("Initial upgrade versionchange transaction unexpected error" + event);
- done();
- }
-}
-
-function putChecker(event) {
- alert("Key used for put was " + event.target.result);
-}
-
-function continueTest1()
-{
- alert("Opening readwrite transaction to bump the key generator, but it will be aborted");
- var transaction = database.transaction('TestObjectStore', "readwrite");
- var objectStore = transaction.objectStore('TestObjectStore');
-
- var request = objectStore.put("bar1");
- request.onsuccess = putChecker;
- var request = objectStore.put("bar2");
- request.onsuccess = putChecker;
- var request = objectStore.put("bar3");
- request.onsuccess = putChecker;
- var request = objectStore.put("bar4");
- request.onsuccess = putChecker;
- var request = objectStore.put("bar5");
- request.onsuccess = putChecker;
- var request = objectStore.put("bar6");
- request.onsuccess = function(event) {
- putChecker(event);
- transaction.abort();
- }
-
- transaction.onabort = function(event) {
- alert("readwrite transaction abort");
- continueTest2();
- }
-
- transaction.oncomplete = function(event) {
- alert("readwrite transaction unexpected complete");
- done();
- }
-
- transaction.onerror = function(event) {
- alert("readwrite transaction unexpected error");
- done();
- }
-}
-
-function continueTest2()
-{
- alert("Opening readwrite transaction to make sure the key generator had successfully reverted");
-
- var transaction = database.transaction('TestObjectStore', "readwrite");
- var objectStore = transaction.objectStore('TestObjectStore');
-
- var request = objectStore.put("bar1");
- request.onsuccess = putChecker;
- var request = objectStore.put("bar2");
- request.onsuccess = putChecker;
- var request = objectStore.put("bar3");
- request.onsuccess = putChecker;
- var request = objectStore.put("bar4");
- request.onsuccess = putChecker;
- var request = objectStore.put("bar5");
- request.onsuccess = putChecker;
- var request = objectStore.put("bar6");
- request.onsuccess = putChecker;
-
- transaction.onabort = function(event) {
- alert("readwrite transaction unexpected abort");
- done();
- }
-
- transaction.oncomplete = function(event) {
- alert("readwrite transaction complete");
- continueTest3();
- }
-
- transaction.onerror = function(event) {
- alert("readwrite transaction unexpected error");
- done();
- }
-}
-
-function continueTest3()
-{
- alert("Opening readwrite transaction to make sure the key generator picks up where it should've left off");
-
- var transaction = database.transaction('TestObjectStore', "readwrite");
- var objectStore = transaction.objectStore('TestObjectStore');
-
- var request = objectStore.put("bar1");
- request.onsuccess = putChecker;
- var request = objectStore.put("bar2");
- request.onsuccess = putChecker;
- var request = objectStore.put("bar3");
- request.onsuccess = putChecker;
- var request = objectStore.put("bar4");
- request.onsuccess = putChecker;
- var request = objectStore.put("bar5");
- request.onsuccess = putChecker;
- var request = objectStore.put("bar6");
- request.onsuccess = putChecker;
-
- transaction.onabort = function(event) {
- alert("readwrite transaction unexpected abort");
- done();
- }
-
- transaction.oncomplete = function(event) {
- alert("readwrite transaction complete");
- done();
- }
-
- transaction.onerror = function(event) {
- alert("readwrite transaction unexpected error");
- done();
- }
-}
-
-</script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
+<script src="resources/autoincrement-abort.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernbasicaddexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/basic-add-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/basic-add-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/basic-add-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,3 +1,8 @@
</span><ins>+This test does basic testing of IDBObjectStore.add(), making sure that an attempt to overwrite an already-existing key fails with the appropriate error.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> ALERT: Upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> ALERT: [object IDBTransaction] - versionchange
</span><span class="cx"> ALERT: [object IDBDatabase]
</span><span class="lines">@@ -5,6 +10,7 @@
</span><span class="cx"> ALERT: put 2 failed - error
</span><span class="cx"> ALERT: get succeeded - key was 'bar'
</span><span class="cx"> ALERT: version change transaction completed
</span><del>-ALERT: Done
-This test does basic testing of IDBObjectStore.add(), making sure that an attempt to overwrite an already-existing key fails with the appropriate error.
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernbasicaddhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/basic-add.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/basic-add.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/basic-add.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,78 +1,9 @@
</span><del>-This test does basic testing of IDBObjectStore.add(), making sure that an attempt to overwrite an already-existing key fails with the appropriate error.<br>
-<script>
-
-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-var request = window.indexedDB.open("NewDatabaseAddTestDatabase");
-
-function done()
-{
- alert("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-request.onupgradeneeded = function(event) {
- alert("Upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var tx = request.transaction;
- var db = event.target.result;
-
- alert(tx + " - " + tx.mode);
- alert(db);
-
- var os = db.createObjectStore("TestObjectStore");
- var putRequest1 = os.add("bar", "foo");
- var putRequest2 = os.add("baz", "foo");
-
- putRequest1.onsuccess = function(event) {
- alert("put 1 succeeded - key was '" + putRequest1.result + "'");
- }
-
- putRequest1.onerror = function(event) {
- alert("put 1 unexpectedly failed - " + event);
- done();
- }
-
- putRequest2.onsuccess = function(event) {
- alert("put 2 unexpectedly succeeded - key was '" + putRequest2.result + "'");
- done();
- }
-
- putRequest2.onerror = function(event) {
- alert("put 2 failed - " + event.type);
-
- var getRequest = os.get("foo");
-
- getRequest.onsuccess = function(event) {
- alert("get succeeded - key was '" + getRequest.result + "'");
- }
-
- getRequest.onerror = function(event) {
- alert("get unexpectedly failed - " + event.type);
- done();
- }
-
- event.stopPropagation();
- event.preventDefault();
- }
-
- tx.onabort = function(event) {
- alert("version change transaction unexpected abort");
- done();
- }
-
- tx.oncomplete = function(event) {
- alert("version change transaction completed");
- done();
- }
-
- tx.onerror = function(event) {
- alert("version change transaction unexpected error - " + event);
- done();
- }
-}
-</script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
+<script src="resources/basic-add.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernbasicputexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/basic-put-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/basic-put-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/basic-put-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -4,5 +4,7 @@
</span><span class="cx"> ALERT: put succeeded - key was 'foo'
</span><span class="cx"> ALERT: get succeeded - value was 'bar'
</span><span class="cx"> ALERT: version change transaction completed
</span><del>-ALERT: Done
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernbasicputhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/basic-put.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/basic-put.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/basic-put.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,64 +1,9 @@
</span><del>-<script>
-
-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-var request = window.indexedDB.open("NewDatabasePutTestDatabase");
-
-function done()
-{
- alert("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-request.onupgradeneeded = function(event) {
- alert("Upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var tx = request.transaction;
- var db = event.target.result;
-
- alert(tx + " - " + tx.mode);
- alert(db);
-
- var os = db.createObjectStore("TestObjectStore");
- var putRequest = os.put("bar", "foo");
-
- putRequest.onsuccess = function(event) {
- alert("put succeeded - key was '" + putRequest.result + "'");
-
- var getRequest = os.get("foo");
- getRequest.onsuccess = function(event) {
- alert("get succeeded - value was '" + getRequest.result + "'");
- }
-
- getRequest.onerror = function(event) {
- alert("get unexpectedly failed - " + event);
- done();
- }
- }
-
- putRequest.onerror = function(event) {
- alert("put unexpectedly failed - " + event);
- done();
- }
-
- tx.onabort = function(event) {
- alert("version change transaction unexpected abort");
- done();
- }
-
- tx.oncomplete = function(event) {
- alert("version change transaction completed");
- done();
- }
-
- tx.onerror = function(event) {
- alert("version change transaction unexpected error - " + event);
- done();
- }
-}
-
-</script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
+<script src="resources/basic-put.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderncreateindexfailuresexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/create-index-failures-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/create-index-failures-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/create-index-failures-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,4 +1,8 @@
</span><span class="cx"> This tests some obvious failures that can happen while calling IDBObjectStore.createIndex().
</span><ins>+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> Failed to create index with null name
</span><span class="cx"> Failed to create index with invalid key path
</span><span class="lines">@@ -9,5 +13,7 @@
</span><span class="cx"> Initial upgrade versionchange transaction complete
</span><span class="cx"> Failed to create index outside of a version change transaction
</span><span class="cx"> readonly transaction complete
</span><del>-Done
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderncreateindexfailureshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/create-index-failures.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/create-index-failures.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/create-index-failures.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,130 +1,10 @@
</span><del>-This tests some obvious failures that can happen while calling IDBObjectStore.createIndex().<br>
-<div id="logger"></div>
-<script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
</ins><span class="cx">
</span><del>-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- log("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-function log(message)
-{
- document.getElementById("logger").innerHTML += message + "<br>";
-}
-
-var createRequest = window.indexedDB.open("IDBObjectStoreCreateIndexFailuresDatabase", 1);
-var database;
-
-createRequest.onupgradeneeded = function(event) {
- log("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- database = event.target.result;
- var objectStore = database.createObjectStore("TestObjectStore");
-
- try {
- objectStore.createIndex(null, "foo");
- } catch(e) {
- log("Failed to create index with null name");
- }
-
- try {
- objectStore.createIndex("TestIndex1", null);
- } catch(e) {
- log("Failed to create index with invalid key path");
- }
-
- database.deleteObjectStore("TestObjectStore");
- try {
- objectStore.createIndex("TestIndex2", "foo");
- } catch(e) {
- log("Failed to create index on a deleted object store");
- }
-
- objectStore = database.createObjectStore("TestObjectStore");
-
- try {
- objectStore.createIndex("TestIndex3", ["foo", "bar"], { multiEntry: true });
- } catch(e) {
- log("Failed to create multi-entry index with an array key path");
- }
-
- objectStore.createIndex("TestIndex4", "foo");
- try {
- objectStore.createIndex("TestIndex4", "foo");
- } catch(e) {
- log("Failed to create index that already exists");
- }
-
- // Spin the transaction with get requests to keep it alive long enough for the setTimeout to fire.
- var canFinish = false;
- var spinGet = function() {
- objectStore.get("foo").onsuccess = function() {
- if (!canFinish)
- spinGet();
- }
- }
- spinGet();
-
- var createWhileInactive = function() {
- try {
- objectStore.createIndex("TestIndex5", "foo");
- } catch(e) {
- log("Failed to create index while the transaction is inactive");
- }
- canFinish = true;
- }
-
- setTimeout(createWhileInactive, 0);
-
- versionTransaction.onabort = function(event) {
- log("Initial upgrade versionchange transaction unexpected aborted");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- log("Initial upgrade versionchange transaction complete");
- continueTest1();
- }
-
- versionTransaction.onerror = function(event) {
- log("Initial upgrade versionchange transaction unexpected error" + event);
- done();
- }
-}
-
-function continueTest1()
-{
- var transaction = database.transaction("TestObjectStore", "readwrite");
- var objectStore = transaction.objectStore("TestObjectStore");
-
- try {
- objectStore.createIndex("TestIndex6", "foo");
- } catch(e) {
- log("Failed to create index outside of a version change transaction");
- }
-
- transaction.onabort = function(event) {
- log("readonly transaction unexpected abort" + event);
- done();
- }
-
- transaction.oncomplete = function(event) {
- log("readonly transaction complete");
- done();
- }
-
- transaction.onerror = function(event) {
- log("readonly transaction unexpected error" + event);
- done();
- }
-}
-
-</script>
</del><ins>+<script src="resources/create-index-failures.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderncreateobjectstorebasicexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/createobjectstore-basic-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/createobjectstore-basic-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/createobjectstore-basic-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,3 +1,8 @@
</span><ins>+This test starts some version change transactions, creates some object stores, and variably commits or aborts the version change transactions. At various stages it verifies the object stores in the database are as-expected.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> ALERT: Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> ALERT: Object store names:
</span><span class="cx"> ALERT: FirstAbortedObjectStore
</span><span class="lines">@@ -21,7 +26,7 @@
</span><span class="cx"> ALERT: Object store names:
</span><span class="cx"> ALERT: FirstCommittedObjectStore
</span><span class="cx"> ALERT: SecondCommittedObjectStore
</span><del>-ALERT: Done
-This test starts some version change transactions, creates some object stores, and variably commits or aborts the version change transactions.
-At various stages it verifies the object stores in the database are as-expected.
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderncreateobjectstorebasichtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/createobjectstore-basic.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/createobjectstore-basic.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/createobjectstore-basic.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,138 +1,9 @@
</span><del>-This test starts some version change transactions, creates some object stores, and variably commits or aborts the version change transactions.<br>
-At various stages it verifies the object stores in the database are as-expected.<br>
-<script>
-
-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- alert("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-function dumpObjectStores(database) {
- var list = database.objectStoreNames;
- alert("Object store names:");
- for (var i = 0; i < list.length; ++i) {
- alert(list[i]);
- }
-}
-
-var createRequest = window.indexedDB.open("CreateObjectStoreTestDatabase", 1);
-
-createRequest.onupgradeneeded = function(event) {
- alert("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- var database = event.target.result;
- var objectStore = database.createObjectStore("FirstAbortedObjectStore");
- var request = objectStore.put("foo", "bar");
-
- request.onsuccess = function(event) {
- alert("Put succeeded");
- versionTransaction.abort();
- }
- request.onerror = function(event) {
- alert("Put failed - " + event);
- done();
- }
-
- dumpObjectStores(database);
-
- versionTransaction.onabort = function(event) {
- alert("Initial upgrade versionchange transaction aborted");
- dumpObjectStores(database);
- continueTest1();
- database.close();
- }
-
- versionTransaction.oncomplete = function(event) {
- alert("Initial upgrade versionchange transaction unexpected complete");
- done();
- }
-
- versionTransaction.onerror = function(event) {
- alert("Initial upgrade versionchange transaction error " + event);
- }
-}
-
-function continueTest1()
-{
- createRequest = window.indexedDB.open("CreateObjectStoreTestDatabase", 1);
-
- createRequest.onupgradeneeded = function(event) {
- alert("Second upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- var database = event.target.result;
- dumpObjectStores(database);
- var objectStore = database.createObjectStore("FirstCommittedObjectStore");
-
- versionTransaction.onabort = function(event) {
- alert("Second upgrade versionchange transaction unexpected abort");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- alert("Second upgrade versionchange transaction complete");
- dumpObjectStores(database);
- continueTest2();
- database.close();
- }
-
- versionTransaction.onerror = function(event) {
- alert("Second upgrade versionchange transaction unexpected error" + event);
- done();
- }
- }
-}
-
-function continueTest2()
-{
- createRequest = window.indexedDB.open("CreateObjectStoreTestDatabase", 2);
-
- createRequest.onupgradeneeded = function(event) {
- alert("Third upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- var database = event.target.result;
- var objectStore = database.createObjectStore("SecondCommittedObjectStore");
-
- dumpObjectStores(database);
-
- versionTransaction.onabort = function(event) {
- alert("Third upgrade versionchange transaction unexpected abort");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- alert("Third upgrade versionchange transaction complete");
- dumpObjectStores(database);
- database.close();
- continueTest3();
- }
-
- versionTransaction.onerror = function(event) {
- alert("Third upgrade versionchange transaction unexpected error" + event);
- done();
- }
- }
-}
-
-function continueTest3()
-{
- createRequest = window.indexedDB.open("CreateObjectStoreTestDatabase", 3);
-
- createRequest.onupgradeneeded = function(event) {
- alert("Fourth upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
- var database = event.target.result;
- dumpObjectStores(database);
- done();
- }
-}
-
-</script>
</del><span class="cx">\ No newline at end of file
</span><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
+<script src="resources/createobjectstore-basic.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderncreateobjectstorefailuresexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/createobjectstore-failures-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/createobjectstore-failures-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/createobjectstore-failures-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,3 +1,8 @@
</span><ins>+This test exercises the obvious ways that IDBDatabase.createObjectStore can fail.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> ALERT: Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> ALERT: Failed to create object store with both autoincrement and an empty keypath: Error: Failed to execute 'createObjectStore' on 'IDBDatabase': The autoIncrement option was set but the keyPath option was empty or an array.
</span><span class="cx"> ALERT: Object store names:
</span><span class="lines">@@ -20,5 +25,7 @@
</span><span class="cx"> ALERT: Failed to create object store outside of onupgradeneeded: Error: Failed to execute 'createObjectStore' on 'IDBDatabase': The database is not running a version change transaction.
</span><span class="cx"> ALERT: Object store names:
</span><span class="cx"> ALERT: TestObjectStore1
</span><del>-ALERT: Done
-This test exercises the obvious ways that IDBDatabase.createObjectStore can fail.
</del><ins>+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderncreateobjectstorefailureshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/createobjectstore-failures.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/createobjectstore-failures.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/createobjectstore-failures.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,103 +1,9 @@
</span><del>-This test exercises the obvious ways that IDBDatabase.createObjectStore can fail.
-<script>
-
-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- alert("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-function dumpObjectStores(database) {
- var list = database.objectStoreNames;
- alert("Object store names:");
- for (var i = 0; i < list.length; ++i) {
- alert(list[i]);
- }
-}
-
-var createRequest = window.indexedDB.open("CreateObjectStoreFailuresTestDatabase", 1);
-var database;
-var versionTransaction;
-
-createRequest.onupgradeneeded = function(event) {
- alert("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- versionTransaction = createRequest.transaction;
- database = event.target.result;
-
- try {
- var objectStore = database.createObjectStore('TestObjectStore', { autoIncrement: true , keyPath: "" });
- } catch (e) {
- alert("Failed to create object store with both autoincrement and an empty keypath: " + e);
- dumpObjectStores(database);
- }
-
- try {
- var objectStore = database.createObjectStore('TestObjectStore', { autoIncrement: true , keyPath: ['foo'] });
- } catch (e) {
- alert("Failed to create object store with both autoincrement and a sequence keypath: " + e);
- dumpObjectStores(database);
- }
-
- try {
- var objectStore = database.createObjectStore('TestObjectStore', { keyPath: "'foo bar'"});
- } catch (e) {
- alert("Failed to create object store with invalid keyPath: " + e);
- dumpObjectStores(database);
- }
-
- database.createObjectStore("TestObjectStore1");
- alert("Actually created an object store");
- dumpObjectStores(database);
-
- try {
- database.createObjectStore("TestObjectStore1");
- } catch(e) {
- alert("Failed to create TestObjectStore a second time: " + e);
- dumpObjectStores(database);
- }
-
- versionTransaction.onabort = function(event) {
- alert("Initial upgrade versionchange unexpected abort");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- alert("Initial upgrade versionchange transaction complete");
- dumpObjectStores(database);
-
- try {
- database.createObjectStore("TestObjectStore2");
- } catch(e) {
- alert("Failed to create object store while there is no version change transaction: " + e);
- dumpObjectStores(database);
- }
-
- setTimeout(finishUp, 0);
- }
-
- versionTransaction.onerror = function(event) {
- alert("Initial upgrade versionchange transaction unexpected error" + event);
- done();
- }
-}
-
-function finishUp()
-{
- try {
- database.createObjectStore("TestObjectStore99");
- } catch(e) {
- alert("Failed to create object store outside of onupgradeneeded: " + e);
- dumpObjectStores(database);
- }
-
- done();
-}
-
-</script>
</del><span class="cx">\ No newline at end of file
</span><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
+<script src="resources/createobjectstore-failures.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderncursor1expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/cursor-1-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/cursor-1-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/cursor-1-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,4 +1,8 @@
</span><span class="cx"> This tests basic IDBCursor functionality
</span><ins>+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> Success opening cursor
</span><span class="cx"> Cursor is: [object IDBCursorWithValue]
</span><span class="lines">@@ -73,5 +77,7 @@
</span><span class="cx"> Cursor key is: Hello
</span><span class="cx"> Cursor primary key is: foo
</span><span class="cx"> Initial upgrade versionchange transaction complete
</span><del>-Done
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderncursor1html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/cursor-1.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/cursor-1.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/cursor-1.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,95 +1,10 @@
</span><del>-This tests basic IDBCursor functionality<br>
-<div id="logger"></div>
-<script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
</ins><span class="cx">
</span><del>-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- log("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-function log(message)
-{
- document.getElementById("logger").innerHTML += message + "<br>";
-}
-
-var createRequest = window.indexedDB.open("Cursor1Database", 1);
-
-function logCursor(cursor)
-{
- log("Cursor is: " + cursor);
- log("Cursor direction is: " + cursor.direction);
- log("Cursor source is: " + cursor.source + " (" + cursor.source.name + ")");
- log("Cursor key is: " + cursor.key);
- log("Cursor primary key is: " + cursor.primaryKey);
-}
-
-function setupRequest(request)
-{
- // FIXME: Right now (until https://bugs.webkit.org/show_bug.cgi?id=151196 is resolved) what should be successful cursor operations will actually always fail.
- request.onsuccess = function() {
- log("Success opening cursor");
- logCursor(request.result);
- }
- request.onerror = function(e) {
- log("Error opening cursor (expected for now)");
- logCursor(request.result);
- e.stopPropagation();
- }
-}
-
-var objectStore;
-var index;
-
-function testCursorDirection(direction)
-{
- var range = IDBKeyRange.lowerBound(-Infinity);
- var request = objectStore.openCursor(range, direction);
- setupRequest(request);
- request = index.openCursor(range, direction);
- setupRequest(request);
- request = index.openKeyCursor(range, direction);
- setupRequest(request);
-}
-
-createRequest.onupgradeneeded = function(event) {
- log("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- var database = event.target.result;
- objectStore = database.createObjectStore("TestObjectStore");
- index = objectStore.createIndex("TestIndex1", "bar");
-
- for (var i = 0; i < 10; ++i) {
- objectStore.put("Record " + i, i);
- }
- objectStore.put({ bar: "Hello" }, "foo");
-
- testCursorDirection("next");
- testCursorDirection("nextunique");
- testCursorDirection("prev");
- testCursorDirection("prevunique");
-
- versionTransaction.onabort = function(event) {
- log("Initial upgrade versionchange transaction unexpected aborted");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- log("Initial upgrade versionchange transaction complete");
- done();
- }
-
- versionTransaction.onerror = function(event) {
- log("Initial upgrade versionchange transaction unexpected error" + event);
- done();
- }
-}
-
-</script>
</del><ins>+<script src="resources/cursor-1.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderncursor2expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/cursor-2-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/cursor-2-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/cursor-2-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,4 +1,8 @@
</span><span class="cx"> This test checks basic functionality walking a "next" and "prev" cursor on an object store with some records.
</span><ins>+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> Success iterating next cursor
</span><span class="cx"> Cursor is: [object IDBCursorWithValue]
</span><span class="lines">@@ -155,5 +159,7 @@
</span><span class="cx"> Cursor value is: Record 0
</span><span class="cx"> Cursor primary key is: 0
</span><span class="cx"> Initial upgrade versionchange transaction complete
</span><del>-Done
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderncursor2html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/cursor-2.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/cursor-2.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/cursor-2.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,88 +1,10 @@
</span><del>-This test checks basic functionality walking a "next" and "prev" cursor on an object store with some records.<br>
-<div id="logger"></div>
-<script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
</ins><span class="cx">
</span><del>-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- log("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-function log(message)
-{
- document.getElementById("logger").innerHTML += message + "<br>";
-}
-
-var createRequest = window.indexedDB.open("Cursor2Database", 1);
-
-function logCursor(cursor)
-{
- log("Cursor is: " + cursor);
- log("Cursor direction is: " + cursor.direction);
- log("Cursor source is: " + cursor.source + " (" + cursor.source.name + ")");
- log("Cursor key is: " + cursor.key);
- log("Cursor value is: " + cursor.value);
- log("Cursor primary key is: " + cursor.primaryKey);
-}
-
-var objectStore;
-var shouldStartPrevious = true;
-function setupRequest(request)
-{
- request.onsuccess = function() {
- if (!request.result) {
- if (shouldStartPrevious) {
- setupRequest(objectStore.openCursor(IDBKeyRange.lowerBound(-Infinity), "prev"));
- shouldStartPrevious = false;
- }
- return;
- }
-
- log("Success iterating " + request.result.direction + " cursor");
- logCursor(request.result);
- request.result.continue();
- }
-
- request.onerror = function(e) {
- log("Error iterating cursor");
- done();
- }
-}
-
-createRequest.onupgradeneeded = function(event) {
- log("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- var database = event.target.result;
- objectStore = database.createObjectStore("TestObjectStore");
-
- for (var i = 0; i < 10; ++i) {
- objectStore.put("Record " + i, i);
- }
- objectStore.put({ bar: "Hello" }, "foo");
-
- setupRequest(objectStore.openCursor());
-
- versionTransaction.onabort = function(event) {
- log("Initial upgrade versionchange transaction unexpected aborted");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- log("Initial upgrade versionchange transaction complete");
- done();
- }
-
- versionTransaction.onerror = function(event) {
- log("Initial upgrade versionchange transaction unexpected error" + event);
- done();
- }
-}
-
-</script>
</del><ins>+<script src="resources/cursor-2.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderncursor3expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/cursor-3-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/cursor-3-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/cursor-3-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,4 +1,8 @@
</span><del>-This test various uses of advance() and continue() on a "next" cursor".
</del><ins>+This test various uses of advance() and continue() on a "next" cursor.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> Success iterating cursor
</span><span class="cx"> Cursor is: [object IDBCursorWithValue]
</span><span class="lines">@@ -71,5 +75,7 @@
</span><span class="cx"> Cursor value is: Record 9
</span><span class="cx"> Cursor primary key is: 9
</span><span class="cx"> Initial upgrade versionchange transaction complete
</span><del>-Done
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderncursor3html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/cursor-3.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/cursor-3.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/cursor-3.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,98 +1,10 @@
</span><del>-This test various uses of advance() and continue() on a "next" cursor".<br>
-<div id="logger"></div>
-<script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
</ins><span class="cx">
</span><del>-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- log("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-function log(message)
-{
- document.getElementById("logger").innerHTML += message + "<br>";
-}
-
-var createRequest = window.indexedDB.open("Cursor3Database", 1);
-
-function logCursor(cursor)
-{
- log("Cursor is: " + cursor);
- log("Cursor direction is: " + cursor.direction);
- log("Cursor source is: " + cursor.source + " (" + cursor.source.name + ")");
- log("Cursor key is: " + cursor.key);
- log("Cursor value is: " + cursor.value);
- log("Cursor primary key is: " + cursor.primaryKey);
-}
-
-var objectStore;
-
-function setupRequest1(request)
-{
- request.onsuccess = function() {
- if (!request.result) {
- setupRequest2(objectStore.openCursor());
- return;
- }
- log("Success iterating cursor");
- logCursor(request.result);
- request.result.continue(request.result.key + 2);
- }
- request.onerror = function(e) {
- log("Error iterating cursor");
- done();
- }
-}
-
-function setupRequest2(request)
-{
- request.onsuccess = function() {
- if (!request.result)
- return;
- log("Success iterating cursor");
- logCursor(request.result);
- request.result.advance(3);
- }
- request.onerror = function(e) {
- log("Error iterating cursor");
- done();
- }
-}
-
-createRequest.onupgradeneeded = function(event) {
- log("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- var database = event.target.result;
- objectStore = database.createObjectStore("TestObjectStore");
-
- for (var i = 0; i < 10; ++i) {
- objectStore.put("Record " + i, i);
- }
- objectStore.put({ bar: "Hello" }, "foo");
-
- setupRequest1(objectStore.openCursor());
-
- versionTransaction.onabort = function(event) {
- log("Initial upgrade versionchange transaction unexpected aborted");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- log("Initial upgrade versionchange transaction complete");
- done();
- }
-
- versionTransaction.onerror = function(event) {
- log("Initial upgrade versionchange transaction unexpected error" + event);
- done();
- }
-}
-
-</script>
</del><ins>+<script src="resources/cursor-3.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderncursor4expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/cursor-4-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/cursor-4-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/cursor-4-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,4 +1,8 @@
</span><del>-This test various uses of advance() and continue() on a "prev" cursor".
</del><ins>+This test various uses of advance() and continue() on a "prev" cursor.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> Success iterating cursor
</span><span class="cx"> Cursor is: [object IDBCursorWithValue]
</span><span class="lines">@@ -64,5 +68,7 @@
</span><span class="cx"> Cursor value is: Record 0
</span><span class="cx"> Cursor primary key is: 0
</span><span class="cx"> Initial upgrade versionchange transaction complete
</span><del>-Done
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderncursor4html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/cursor-4.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/cursor-4.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/cursor-4.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,97 +1,10 @@
</span><del>-This test various uses of advance() and continue() on a "prev" cursor".<br>
-<div id="logger"></div>
-<script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
</ins><span class="cx">
</span><del>-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- log("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-function log(message)
-{
- document.getElementById("logger").innerHTML += message + "<br>";
-}
-
-var createRequest = window.indexedDB.open("Cursor4Database", 1);
-
-function logCursor(cursor)
-{
- log("Cursor is: " + cursor);
- log("Cursor direction is: " + cursor.direction);
- log("Cursor source is: " + cursor.source + " (" + cursor.source.name + ")");
- log("Cursor key is: " + cursor.key);
- log("Cursor value is: " + cursor.value);
- log("Cursor primary key is: " + cursor.primaryKey);
-}
-
-var objectStore;
-
-function setupRequest1(request)
-{
- request.onsuccess = function() {
- if (!request.result) {
- setupRequest2(objectStore.openCursor(IDBKeyRange.lowerBound(-Infinity), "prev"));
- return;
- }
- log("Success iterating cursor");
- logCursor(request.result);
- request.result.continue(request.result.key - 2);
- }
- request.onerror = function(e) {
- log("Error iterating cursor");
- done();
- }
-}
-
-function setupRequest2(request)
-{
- request.onsuccess = function() {
- if (!request.result)
- return;
- log("Success iterating cursor");
- logCursor(request.result);
- request.result.advance(3);
- }
- request.onerror = function(e) {
- log("Error iterating cursor");
- done();
- }
-}
-
-createRequest.onupgradeneeded = function(event) {
- log("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- var database = event.target.result;
- objectStore = database.createObjectStore("TestObjectStore");
-
- for (var i = 0; i < 10; ++i) {
- objectStore.put("Record " + i, i);
- }
-
- setupRequest1(objectStore.openCursor(IDBKeyRange.lowerBound(-Infinity), "prev"));
-
- versionTransaction.onabort = function(event) {
- log("Initial upgrade versionchange transaction unexpected aborted");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- log("Initial upgrade versionchange transaction complete");
- done();
- }
-
- versionTransaction.onerror = function(event) {
- log("Initial upgrade versionchange transaction unexpected error" + event);
- done();
- }
-}
-
-</script>
</del><ins>+<script src="resources/cursor-4.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderncursor5expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/cursor-5-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/cursor-5-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/cursor-5-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,9 +1,15 @@
</span><span class="cx"> This tests iterating a "next" cursor in a read-write transaction while changing records.
</span><ins>+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> Cursor open at key 0
</span><span class="cx"> Record 0 deleted, even though that's where the cursor currently points.
</span><span class="cx"> Cursor iterated to key 1
</span><span class="cx"> Cursor iterated to key 2 with value 'Scary new actual record!'
</span><span class="cx"> Initial upgrade versionchange transaction complete
</span><del>-Done
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderncursor5html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/cursor-5.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/cursor-5.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/cursor-5.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,77 +1,10 @@
</span><del>-This tests iterating a "next" cursor in a read-write transaction while changing records.<br>
-<div id="logger"></div>
-<script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
</ins><span class="cx">
</span><del>-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- log("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-function log(message)
-{
- document.getElementById("logger").innerHTML += message + "<br>";
-}
-
-var createRequest = window.indexedDB.open("Cursor5Database", 1);
-
-createRequest.onupgradeneeded = function(event) {
- log("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- var database = event.target.result;
- var objectStore = database.createObjectStore("TestObjectStore");
-
- for (var i = 0; i < 3; ++i)
- objectStore.put("Record " + i, i);
-
- var request = objectStore.openCursor();
- request.onsuccess = function() {
- log("Cursor open at key " + request.result.key);
-
- // This tests deleting the current record out of underneath the cursor.
- // Its current key should be 0, after an iteration its next key should be 1.
- objectStore.delete(0).onsuccess = function() {
- log("Record 0 deleted, even though that's where the cursor currently points.");
- }
-
- // Now that cursor iteration has begun, manually delete and then replace a record
- // that will eventually be iterated to, making sure the new value is picked up.
- objectStore.delete(2);
- objectStore.put("Scary new actual record!", 2);
-
- request.onsuccess = function() {
- log("Cursor iterated to key " + request.result.key);
-
- request.onsuccess = function() {
- log("Cursor iterated to key " + request.result.key + " with value '" + request.result.value + "'");
- }
-
- request.result.continue();
- }
- request.result.continue();
- }
-
- versionTransaction.onabort = function(event) {
- log("Initial upgrade versionchange transaction unexpected aborted");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- log("Initial upgrade versionchange transaction complete");
- done();
- }
-
- versionTransaction.onerror = function(event) {
- log("Initial upgrade versionchange transaction unexpected error" + event);
- done();
- }
-}
-
-</script>
</del><ins>+<script src="resources/cursor-5.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderncursor6expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/cursor-6-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/cursor-6-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/cursor-6-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,9 +1,15 @@
</span><span class="cx"> This tests iterating a "prev" cursor in a read-write transaction while changing records.
</span><ins>+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> Cursor open at key 2
</span><span class="cx"> Record 2 deleted, even though that's where the cursor currently points.
</span><span class="cx"> Cursor iterated to key 1
</span><span class="cx"> Cursor iterated to key 0 with value 'Scary new actual record!'
</span><span class="cx"> Initial upgrade versionchange transaction complete
</span><del>-Done
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderncursor6html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/cursor-6.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/cursor-6.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/cursor-6.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,78 +1,10 @@
</span><del>-This tests iterating a "prev" cursor in a read-write transaction while changing records.<br>
-<div id="logger"></div>
-<script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
</ins><span class="cx">
</span><del>-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- log("Done");
-
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-function log(message)
-{
- document.getElementById("logger").innerHTML += message + "<br>";
-}
-
-var createRequest = window.indexedDB.open("Cursor6Database", 1);
-
-createRequest.onupgradeneeded = function(event) {
- log("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- var database = event.target.result;
- var objectStore = database.createObjectStore("TestObjectStore");
-
- for (var i = 0; i < 3; ++i)
- objectStore.put("Record " + i, i);
-
- var request = objectStore.openCursor(IDBKeyRange.lowerBound(-Infinity), "prev");
- request.onsuccess = function() {
- log("Cursor open at key " + request.result.key);
-
- // This tests deleting the current record out of underneath the cursor.
- // Its current key should be 2, after an iteration its next key should be 1.
- objectStore.delete(2).onsuccess = function() {
- log("Record 2 deleted, even though that's where the cursor currently points.");
- }
-
- // Now that cursor iteration has begun, manually delete and then replace a record
- // that will eventually be iterated to, making sure the new value is picked up.
- objectStore.delete(0);
- objectStore.put("Scary new actual record!", 0);
-
- request.onsuccess = function() {
- log("Cursor iterated to key " + request.result.key);
-
- request.onsuccess = function() {
- log("Cursor iterated to key " + request.result.key + " with value '" + request.result.value + "'");
- }
-
- request.result.continue();
- }
- request.result.continue();
- }
-
- versionTransaction.onabort = function(event) {
- log("Initial upgrade versionchange transaction unexpected aborted");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- log("Initial upgrade versionchange transaction complete");
- done();
- }
-
- versionTransaction.onerror = function(event) {
- log("Initial upgrade versionchange transaction unexpected error" + event);
- done();
- }
-}
-
-</script>
</del><ins>+<script src="resources/cursor-6.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderncursor7expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/cursor-7-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/cursor-7-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/cursor-7-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,8 +1,14 @@
</span><span class="cx"> This tests iterating a "next" cursor in a read-write transaction combined with clearing the object store.
</span><ins>+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> Cursor open at key 0
</span><span class="cx"> Object store cleared.
</span><span class="cx"> Cursor iterated to key 100
</span><span class="cx"> Initial upgrade versionchange transaction complete
</span><del>-Done
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderncursor7html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/cursor-7.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/cursor-7.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/cursor-7.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,71 +1,10 @@
</span><del>-This tests iterating a "next" cursor in a read-write transaction combined with clearing the object store.<br>
-<div id="logger"></div>
-<script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
</ins><span class="cx">
</span><del>-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- log("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-function log(message)
-{
- document.getElementById("logger").innerHTML += message + "<br>";
-}
-
-var createRequest = window.indexedDB.open("Cursor7Database", 1);
-
-createRequest.onupgradeneeded = function(event) {
- log("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- var database = event.target.result;
- var objectStore = database.createObjectStore("TestObjectStore");
-
- for (var i = 0; i < 3; ++i)
- objectStore.put("Record " + i, i);
-
- var request = objectStore.openCursor();
- request.onsuccess = function() {
- log("Cursor open at key " + request.result.key);
-
- // This tests deleting the current record out of underneath the cursor.
- // Its current key should be 0, after an iteration its next key should be 1.
- objectStore.clear().onsuccess = function() {
- log("Object store cleared.");
- }
-
- // The cursor is currently on key 0, which no longer exists.
- // It's next key would have been 1, but the object store has been cleared.
- // Whatever key we put in the object store that is greater than 0 will be the actual next key.
- objectStore.put("Record 100", 100);
-
- request.onsuccess = function() {
- log("Cursor iterated to key " + request.result.key);
- }
- request.result.continue();
- }
-
- versionTransaction.onabort = function(event) {
- log("Initial upgrade versionchange transaction unexpected aborted");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- log("Initial upgrade versionchange transaction complete");
- done();
- }
-
- versionTransaction.onerror = function(event) {
- log("Initial upgrade versionchange transaction unexpected error" + event);
- done();
- }
-}
-
-</script>
</del><ins>+<script src="resources/cursor-7.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderncursor8expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/cursor-8-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/cursor-8-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/cursor-8-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,8 +1,14 @@
</span><span class="cx"> This tests iterating a "prev" cursor in a read-write transaction while changing records.
</span><ins>+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> Cursor open at key 2
</span><span class="cx"> Object store cleared.
</span><span class="cx"> Cursor iterated to key -100
</span><span class="cx"> Initial upgrade versionchange transaction complete
</span><del>-Done
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderncursor8html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/cursor-8.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/cursor-8.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/cursor-8.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,72 +1,10 @@
</span><del>-This tests iterating a "prev" cursor in a read-write transaction while changing records.<br>
-<div id="logger"></div>
-<script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
</ins><span class="cx">
</span><del>-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- log("Done");
-
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-function log(message)
-{
- document.getElementById("logger").innerHTML += message + "<br>";
-}
-
-var createRequest = window.indexedDB.open("Cursor8Database", 1);
-
-createRequest.onupgradeneeded = function(event) {
- log("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- var database = event.target.result;
- var objectStore = database.createObjectStore("TestObjectStore");
-
- for (var i = 0; i < 3; ++i)
- objectStore.put("Record " + i, i);
-
- var request = objectStore.openCursor(IDBKeyRange.lowerBound(-Infinity), "prev");
- request.onsuccess = function() {
- log("Cursor open at key " + request.result.key);
-
- // This tests deleting the current record out of underneath the cursor.
- // Its current key should be 0, after an iteration its next key should be 1.
- objectStore.clear().onsuccess = function() {
- log("Object store cleared.");
- }
-
- // The cursor is currently on key 2, which no longer exists.
- // It's next key would have been 1, but the object store has been cleared.
- // Whatever key we put in the object store that is less than 2 will be the actual next key.
- objectStore.put("Record -100", -100);
-
- request.onsuccess = function() {
- log("Cursor iterated to key " + request.result.key);
- }
- request.result.continue();
- }
-
- versionTransaction.onabort = function(event) {
- log("Initial upgrade versionchange transaction unexpected aborted");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- log("Initial upgrade versionchange transaction complete");
- done();
- }
-
- versionTransaction.onerror = function(event) {
- log("Initial upgrade versionchange transaction unexpected error" + event);
- done();
- }
-}
-
-</script>
</del><ins>+<script src="resources/cursor-8.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderndatebasicexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/date-basic-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/date-basic-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/date-basic-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,3 +1,8 @@
</span><ins>+This tests using Date objects as keys and values.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> ALERT: Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> ALERT: Initial upgrade versionchange transaction complete
</span><span class="cx"> ALERT: Success getting key 'Fri Nov 04 1955 17:00:00 GMT-0700 (PDT)' of type object, result is 'Flux capacitor' of type string
</span><span class="lines">@@ -13,5 +18,7 @@
</span><span class="cx"> ALERT: Success getting key 'c' of type string, result is 'Wed Oct 21 2015 09:00:00 GMT-0700 (PDT)' of type object
</span><span class="cx"> ALERT: Result is a Date object, btw
</span><span class="cx"> ALERT: readonly transaction complete
</span><del>-ALERT: Done
-This tests using Date objects as keys and values.
</del><ins>+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderndatebasichtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/date-basic.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/date-basic.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/date-basic.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,100 +1,9 @@
</span><del>-This tests using Date objects as keys and values.
-<script>
-
-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- alert("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-var createRequest = window.indexedDB.open("DateBasicDatabase", 1);
-var database;
-
-var date1 = new Date("1955-11-05T00:00:00");
-var date2 = new Date("1955-11-12T18:00:00");
-var date3 = new Date("2015-10-21T16:00:00");
-
-createRequest.onupgradeneeded = function(event) {
- alert("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- database = event.target.result;
- var objectStore = database.createObjectStore("TestObjectStore");
-
- objectStore.put("Flux capacitor", date1);
- objectStore.put("Fish under the sea", date2);
- objectStore.put("Hoverboards", date3);
-
- objectStore.put(date1, "a");
- objectStore.put(date2, "b");
- objectStore.put(date3, "c");
-
- versionTransaction.onabort = function(event) {
- alert("Initial upgrade versionchange transaction unexpected aborted");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- alert("Initial upgrade versionchange transaction complete");
- continueTest1();
- }
-
- versionTransaction.onerror = function(event) {
- alert("Initial upgrade versionchange transaction unexpected error" + event);
- done();
- }
-}
-
-var objectStore;
-
-function testGet(key) {
- var request = objectStore.get(key);
- request.onsuccess = function()
- {
- alert("Success getting key '" + key + "' of type " + typeof(key) + ", result is '" + request.result + "' of type " + typeof(request.result));
- if (key instanceof Date)
- alert("Key is a Date object, btw");
- if (request.result instanceof Date)
- alert("Result is a Date object, btw");
- }
- request.onerror = function()
- {
- alert("Expected error getting key '" + key + "'");
- }
-}
-
-function continueTest1()
-{
- var transaction = database.transaction("TestObjectStore", "readonly");
- objectStore = transaction.objectStore("TestObjectStore");
-
- testGet(date1);
- testGet(date2);
- testGet(date3);
- testGet("a");
- testGet("b");
- testGet("c");
-
- transaction.onabort = function(event) {
- alert("readonly transaction unexpected abort" + event);
- done();
- }
-
- transaction.oncomplete = function(event) {
- alert("readonly transaction complete");
- done();
- }
-
- transaction.onerror = function(event) {
- alert("readonly transaction unexpected error" + event);
- done();
- }
-}
-
-</script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
+<script src="resources/date-basic.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderndeletedatabase1expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-1-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-1-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-1-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,4 +1,8 @@
</span><span class="cx"> This tests that if deleteDatabase is called while there is already an open connection to the database that the open connection gets the appropriate versionChange event.
</span><ins>+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> Initial upgrade old version - 0 new version - 1
</span><span class="cx"> Version change complete
</span><span class="cx"> Requesting deleteDatabase
</span><span class="lines">@@ -9,5 +13,7 @@
</span><span class="cx"> Second upgrade old version - 0 new version - 1
</span><span class="cx"> Unable to get object store in second upgrade transaction (which is correct because it should not be there)
</span><span class="cx"> Second database upgrade success
</span><del>-Done
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderndeletedatabase1html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-1.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-1.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-1.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,132 +1,10 @@
</span><del>-This tests that if deleteDatabase is called while there is already an open connection to the database that the open connection gets the appropriate versionChange event.<br>
-<div id="logger"></div>
-<script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
</ins><span class="cx">
</span><del>-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- log("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-function log(message)
-{
- document.getElementById("logger").innerHTML += message + "<br>";
-}
-
-var request = window.indexedDB.open("DeleteDatabase1TestDatabase");
-request.onsuccess = function()
-{
- log("open db success");
-}
-request.onerror = function(e)
-{
- log("Unexpected error");
- done();
-}
-
-request.onupgradeneeded = function(e)
-{
- log("Initial upgrade old version - " + e.oldVersion + " new version - " + e.newVersion);
-
- var versionTransaction = request.transaction;
- var database = event.target.result;
- var objectStore = database.createObjectStore("TestObjectStore");
- objectStore.put("This is a record", 1);
-
- request.transaction.oncomplete = function()
- {
- log("Version change complete");
- database.onversionchange = function(e)
- {
- log("First connection received versionchange event: oldVersion " + e.oldVersion + ", newVersion " + e.newVersion);
- database.close();
- }
- continueTest1();
- }
- request.transaction.onabort = function()
- {
- log("Version change unexpected abort");
- done();
- }
- request.transaction.onerror = function()
- {
- log("Version change unexpected error");
- done();
- }
-}
-
-function continueTest1()
-{
- log("Requesting deleteDatabase");
- var request = window.indexedDB.deleteDatabase("DeleteDatabase1TestDatabase");
- request.onsuccess = function(e)
- {
- log("Delete database success: oldVersion " + e.oldVersion + ", newVersion " + e.newVersion);
- continueTest2();
- }
- request.onerror = function(e)
- {
- log("Delete database unexpected error");
- done();
- }
- request.onupgradeneeded = function(e)
- {
- log("Delete database unexpected upgradeneeded");
- done();
- }
-}
-
-function continueTest2()
-{
- log("Recreating database to make sure it's new and empty");
- var request = window.indexedDB.open("DeleteDatabase1TestDatabase");
-
- request.onupgradeneeded = function(e)
- {
- log("Second upgrade old version - " + e.oldVersion + " new version - " + e.newVersion);
- var versionTransaction = request.transaction;
-
- try {
- var objectStore = versionTransaction.objectStore("TestObjectStore");
- } catch(e) {
- log("Unable to get object store in second upgrade transaction (which is correct because it should not be there)");
- }
-
- versionTransaction.oncomplete = function(e)
- {
- log("Second database upgrade success");
- done();
- }
-
- versionTransaction.onabort = function(e)
- {
- log("Second database upgrade unexpected abort");
- done();
- }
-
- versionTransaction.onerror = function(e)
- {
- log("Second database upgrade unexpected error");
- done();
- }
- }
-
- request.onsuccess = function(e)
- {
- log("Second database opening unexpected success");
- done();
- }
-
- request.onerror = function(e)
- {
- log("Second database opening unexpected error");
- done();
- }
-}
-</script>
</del><ins>+<script src="resources/deletedatabase-1.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderndeletedatabase2expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-2-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-2-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-2-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,5 +1,8 @@
</span><del>-This tests that if deleteDatabase is called while there is already an open connection to the database that the open connection gets the appropriate versionChange event.
-That open connection also has an in-progress transaction at the time it gets the versionChange event.
</del><ins>+This tests that if deleteDatabase is called while there is already an open connection to the database that the open connection gets the appropriate versionChange event. That open connection also has an in-progress transaction at the time it gets the versionChange event.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> Initial upgrade old version - 0 new version - 1
</span><span class="cx"> Requesting deleteDatabase
</span><span class="cx"> First connection received versionchange event: oldVersion 1, newVersion null
</span><span class="lines">@@ -10,5 +13,7 @@
</span><span class="cx"> Second upgrade old version - 0 new version - 1
</span><span class="cx"> Unable to get object store in second upgrade transaction (which is correct because it should not be there)
</span><span class="cx"> Second database upgrade success
</span><del>-Done
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderndeletedatabase2html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-2.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-2.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-2.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,149 +1,10 @@
</span><del>-This tests that if deleteDatabase is called while there is already an open connection to the database that the open connection gets the appropriate versionChange event.<br>
-That open connection also has an in-progress transaction at the time it gets the versionChange event.<br>
-<div id="logger"></div>
-<script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
</ins><span class="cx">
</span><del>-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- log("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-function log(message)
-{
- document.getElementById("logger").innerHTML += message + "<br>";
-}
-
-var stopSpinning = false;
-
-var request = window.indexedDB.open("DeleteDatabase2TestDatabase");
-request.onsuccess = function()
-{
- log("open db success");
-}
-request.onerror = function(e)
-{
- log("Open request error: " + request.error.name);
-}
-
-request.onupgradeneeded = function(e)
-{
- log("Initial upgrade old version - " + e.oldVersion + " new version - " + e.newVersion);
-
- var versionTransaction = request.transaction;
- var database = event.target.result;
- var objectStore = database.createObjectStore("TestObjectStore");
- objectStore.put("This is a record", 1);
-
- // Spin the transaction until told to stop spinning it.
- var keepGoing = function() {
- if (!stopSpinning)
- objectStore.get(1).onsuccess = keepGoing;
- }
- objectStore.get(1).onsuccess = keepGoing;
-
- database.onversionchange = function(e)
- {
- log("First connection received versionchange event: oldVersion " + e.oldVersion + ", newVersion " + e.newVersion);
-
- var shutErDown = function() {
- database.close();
- stopSpinning = true;
- }
- window.setTimeout(shutErDown, 0);
- }
-
- request.transaction.oncomplete = function()
- {
- log("First version change complete");
- }
-
- request.transaction.onabort = function()
- {
- log("Version change unexpected abort");
- done();
- }
- request.transaction.onerror = function()
- {
- log("Version change unexpected error");
- done();
- }
-
- window.setTimeout(continueTest1, 0);
-}
-
-function continueTest1()
-{
- log("Requesting deleteDatabase");
- var request = window.indexedDB.deleteDatabase("DeleteDatabase2TestDatabase");
- request.onsuccess = function(e)
- {
- log("Delete database success: oldVersion " + e.oldVersion + ", newVersion " + e.newVersion);
- continueTest2();
- }
- request.onerror = function(e)
- {
- log("Delete database unexpected error");
- done();
- }
- request.onupgradeneeded = function(e)
- {
- log("Delete database unexpected upgradeneeded");
- done();
- }
-}
-
-function continueTest2()
-{
- log("Recreating database to make sure it's new and empty");
- var request = window.indexedDB.open("DeleteDatabase2TestDatabase");
-
- request.onupgradeneeded = function(e)
- {
- log("Second upgrade old version - " + e.oldVersion + " new version - " + e.newVersion);
- var versionTransaction = request.transaction;
-
- try {
- var objectStore = versionTransaction.objectStore("TestObjectStore");
- } catch(e) {
- log("Unable to get object store in second upgrade transaction (which is correct because it should not be there)");
- }
-
- versionTransaction.oncomplete = function(e)
- {
- log("Second database upgrade success");
- done();
- }
-
- versionTransaction.onabort = function(e)
- {
- log("Second database upgrade unexpected abort");
- done();
- }
-
- versionTransaction.onerror = function(e)
- {
- log("Second database upgrade unexpected error");
- done();
- }
- }
-
- request.onsuccess = function(e)
- {
- log("Second database opening unexpected success");
- done();
- }
-
- request.onerror = function(e)
- {
- log("Second database opening unexpected error");
- done();
- }
-}
-</script>
</del><ins>+<script src="resources/deletedatabase-2.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderndeletedatabasenullnameexceptionexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-null-name-exception-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-null-name-exception-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-null-name-exception-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,3 +1,10 @@
</span><ins>+This test calls deleteDatabase on window.indexedDB with a null database name, making sure there is an exception.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> ALERT: TypeError: Not enough arguments
</span><del>-ALERT: Done
-This test calls deleteDatabase on window.indexedDB with a null database name, making sure there is an exception.
</del><ins>+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderndeletedatabasenullnameexceptionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-null-name-exception.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-null-name-exception.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-null-name-exception.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,23 +1,9 @@
</span><del>-This test calls deleteDatabase on window.indexedDB with a null database name, making sure there is an exception.
-<script>
-
-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- alert("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-try {
- var request = window.indexedDB.deleteDatabase();
-} catch (e) {
- alert(e);
-}
-
-done();
-</script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
+<script src="resources/deletedatabase-null-name-exception.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderndeletedatabaserequesteventexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-request-event-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-request-event-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-request-event-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,5 +1,11 @@
</span><ins>+This test calls deleteDatabase on window.indexedDB and verifies that an event is fired at the request.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> ALERT: [object IDBOpenDBRequest]
</span><span class="cx"> ALERT: success
</span><del>-ALERT: Done
-This test calls deleteDatabase on window.indexedDB and verifies that an event is fired at the request.
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderndeletedatabaserequesteventhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-request-event.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-request-event.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-request-event.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,31 +1,9 @@
</span><del>-This test calls deleteDatabase on window.indexedDB and verifies that an event is fired at the request.<br>
-<script>
-
-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- alert("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-var request = window.indexedDB.deleteDatabase("TestDatabase");
-
-request.onsuccess = function()
-{
- alert("success");
- done();
-}
-request.onerror = function(e)
-{
- alert("error " + e);
- done();
-}
-
-alert(request);
-
-</script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
+<script src="resources/deletedatabase-request-event.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderndeletedatabaserequestexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-request-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-request-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-request-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,3 +1,10 @@
</span><ins>+This test calls deleteDatabase on window.indexedDB and verifies that an IDBOpenDBRequest object is returned.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> ALERT: [object IDBOpenDBRequest]
</span><del>-ALERT: Done
-This test calls deleteDatabase on window.indexedDB and verifies that an IDBOpenDBRequest object is returned.
</del><ins>+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderndeletedatabaserequesthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-request.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-request.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-request.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,20 +1,9 @@
</span><del>-This test calls deleteDatabase on window.indexedDB and verifies that an IDBOpenDBRequest object is returned.
-<script>
-
-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- alert("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-var request = window.indexedDB.deleteDatabase("TestDatabase");
-alert(request);
-
-done();
-</script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
+<script src="resources/deletedatabase-request.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderndeleteindex1expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/deleteindex-1-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/deleteindex-1-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/deleteindex-1-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,4 +1,8 @@
</span><span class="cx"> This tests deleting an index and then committing the transaction.
</span><ins>+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> Count is: 2
</span><span class="cx"> Cursor at record: A / 1
</span><span class="lines">@@ -8,5 +12,7 @@
</span><span class="cx"> Object store has indexes:
</span><span class="cx"> Unable to get index from object store (it shouldn't exist)
</span><span class="cx"> Transaction complete
</span><del>-Done
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderndeleteindex1html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/deleteindex-1.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/deleteindex-1.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/deleteindex-1.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,113 +1,10 @@
</span><del>-This tests deleting an index and then committing the transaction.<br>
-<div id="logger"></div>
-<script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
</ins><span class="cx">
</span><del>-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- log("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-function log(message)
-{
- document.getElementById("logger").innerHTML += message + "<br>";
-}
-
-var index;
-var objectStore;
-var database;
-
-function checkIndexValues()
-{
- var countRequest = index.count();
- countRequest.onsuccess = function() {
- log("Count is: " + countRequest.result);
- }
-
- var cursorRequest = index.openCursor();
- cursorRequest.onsuccess = function() {
- var cursor = cursorRequest.result;
- if (!cursor) {
- objectStore.deleteIndex("TestIndex1");
- log("Deleted the index");
- return;
- }
-
- log("Cursor at record: " + cursor.key + " / " + cursor.primaryKey);
- cursor.continue();
- }
- cursorRequest.onerror = function(e) {
- log("Unexpected error opening or iterating cursor");
- logCursor(cursorRequest.result);
- done();
- }
-}
-
-var createRequest = window.indexedDB.open("DeleteIndex1Database", 1);
-createRequest.onupgradeneeded = function(event) {
- log("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- database = event.target.result;
- objectStore = database.createObjectStore("TestObjectStore");
- objectStore.put({ bar: "A" }, 1);
- objectStore.put({ bar: "A" }, 2);
-
- index = objectStore.createIndex("TestIndex1", "bar");
-
- checkIndexValues();
-
- versionTransaction.onabort = function(event) {
- log("Initial upgrade versionchange transaction unexpected abort");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- log("Initial upgrade versionchange transaction complete");
- continueTest();
- }
-
- versionTransaction.onerror = function(event) {
- log("Initial upgrade versionchange transaction unexpected error" + event);
- done();
- }
-}
-
-function continueTest() {
- var transaction = database.transaction("TestObjectStore");
- objectStore = transaction.objectStore("TestObjectStore");
-
- var names = objectStore.indexNames;
- log("Object store has indexes:")
- for (var i = 0; i < names.length; ++i)
- log(names[i]);
-
- try {
- objectStore.index("TestIndex1");
- } catch(e) {
- log("Unable to get index from object store (it shouldn't exist)");
- }
-
- transaction.onabort = function(event) {
- log("Transaction unexpected abort");
- done();
- }
-
- transaction.oncomplete = function(event) {
- log("Transaction complete");
- done();
- }
-
- transaction.onerror = function(event) {
- log("Transaction unexpected error" + event);
- done();
- }
-}
-
-</script>
</del><ins>+<script src="resources/deleteindex-1.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderndeleteindex2expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/deleteindex-2-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/deleteindex-2-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/deleteindex-2-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,4 +1,8 @@
</span><span class="cx"> This tests deleting an index and then aborting the transaction.
</span><ins>+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> Count is: 2
</span><span class="cx"> Cursor at record: A / 1
</span><span class="lines">@@ -13,5 +17,7 @@
</span><span class="cx"> Cursor at record: A / 1
</span><span class="cx"> Cursor at record: A / 2
</span><span class="cx"> Third upgrade versionchange transaction complete
</span><del>-Done
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderndeleteindex2html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/deleteindex-2.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/deleteindex-2.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/deleteindex-2.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,138 +1,10 @@
</span><del>-This tests deleting an index and then aborting the transaction.<br>
-<div id="logger"></div>
-<script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
</ins><span class="cx">
</span><del>-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- log("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-function log(message)
-{
- document.getElementById("logger").innerHTML += message + "<br>";
-}
-
-var index;
-var objectStore;
-var database;
-
-function checkIndexValues()
-{
- var countRequest = index.count();
- countRequest.onsuccess = function() {
- log("Count is: " + countRequest.result);
- }
-
- var cursorRequest = index.openCursor();
- cursorRequest.onsuccess = function() {
- var cursor = cursorRequest.result;
- if (!cursor)
- return;
-
- log("Cursor at record: " + cursor.key + " / " + cursor.primaryKey);
- cursor.continue();
- }
- cursorRequest.onerror = function(e) {
- log("Unexpected error opening or iterating cursor");
- logCursor(cursorRequest.result);
- done();
- }
-}
-
-var createRequest = window.indexedDB.open("DeleteIndex2Database", 1);
-createRequest.onupgradeneeded = function(event) {
- log("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- database = event.target.result;
- objectStore = database.createObjectStore("TestObjectStore");
- objectStore.put({ bar: "A" }, 1);
- objectStore.put({ bar: "A" }, 2);
-
- index = objectStore.createIndex("TestIndex1", "bar");
-
- checkIndexValues();
-
- versionTransaction.onabort = function(event) {
- log("Initial upgrade versionchange transaction unexpected abort");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- log("Initial upgrade versionchange transaction complete");
- database.close();
- continueTest1();
- }
-
- versionTransaction.onerror = function(event) {
- log("Initial upgrade versionchange transaction unexpected error" + event);
- done();
- }
-}
-
-function continueTest1() {
- var createRequest = window.indexedDB.open("DeleteIndex2Database", 2);
- createRequest.onupgradeneeded = function(event) {
- log("Second upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- database = event.target.result;
- var versionTransaction = createRequest.transaction;
- objectStore = versionTransaction.objectStore("TestObjectStore");
- objectStore.deleteIndex("TestIndex1");
- log("Deleted the index");
- versionTransaction.abort();
- log("Aborted the transaction");
-
- versionTransaction.onabort = function(event) {
- log("Second upgrade versionchange transaction abort");
- database.close();
- continueTest2();
- }
-
- versionTransaction.oncomplete = function(event) {
- log("Second upgrade versionchange transaction unexpected complete");
- done();
- }
-
- versionTransaction.onerror = function(event) {
- log("Second upgrade versionchange transaction error " + event);
- }
- }
-}
-
-function continueTest2() {
- var createRequest = window.indexedDB.open("DeleteIndex2Database", 3);
- createRequest.onupgradeneeded = function(event) {
- log("Third upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- objectStore = versionTransaction.objectStore("TestObjectStore");
- index = objectStore.index("TestIndex1");
-
- checkIndexValues();
-
- versionTransaction.onabort = function(event) {
- log("Third upgrade versionchange transaction unexpected abort");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- log("Third upgrade versionchange transaction complete");
- done();
- }
-
- versionTransaction.onerror = function(event) {
- log("Third upgrade versionchange transaction unexpected error" + event);
- done();
- }
- }
-}
-
-</script>
</del><ins>+<script src="resources/deleteindex-2.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderndeleteobjectstore1expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/deleteobjectstore-1-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/deleteobjectstore-1-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/deleteobjectstore-1-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,3 +1,8 @@
</span><ins>+This test creates an object store then populates it, then commits that transaction. It then deletes it, but aborts that transaction. Finally it checks to make sure everything from step 1 is there as expected.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> ALERT: Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> ALERT: Initial upgrade versionchange transaction complete
</span><span class="cx"> ALERT: Second upgrade needed: Old version - 1 New version - 2
</span><span class="lines">@@ -16,8 +21,7 @@
</span><span class="cx"> ALERT: Value gotten was AH AH AH AH AH
</span><span class="cx"> ALERT: Value gotten was AH AH AH AH AH
</span><span class="cx"> ALERT: Final transaction complete
</span><del>-ALERT: Done
-This test creates an object store then populates it, then commits that transaction.
-It then deletes it, but aborts that transaction.
-Finally it checks to make sure everything from step 1 is there as expected.
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderndeleteobjectstore1html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/deleteobjectstore-1.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/deleteobjectstore-1.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/deleteobjectstore-1.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,139 +1,9 @@
</span><del>-This test creates an object store then populates it, then commits that transaction.<br>
-It then deletes it, but aborts that transaction.<br>
-Finally it checks to make sure everything from step 1 is there as expected.<br>
-<script>
-
-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- alert("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-var createRequest = window.indexedDB.open("DeleteObjectStore1Database", 1);
-
-createRequest.onupgradeneeded = function(event) {
- alert("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- var database = event.target.result;
- var objectStore = database.createObjectStore("TestObjectStore");
- for (var i = 0; i < 10; ++i)
- objectStore.put("AH AH AH AH AH", i + " puts");
-
- versionTransaction.onabort = function(event) {
- alert("Initial upgrade versionchange transaction unexpected aborted");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- alert("Initial upgrade versionchange transaction complete");
- database.close();
- continueTest1();
- }
-
- versionTransaction.onerror = function(event) {
- alert("Initial upgrade versionchange transaction unexpected error" + event);
- done();
- }
-}
-
-function getChecker(event) {
- alert("Value gotten was " + event.target.result);
-}
-
-function continueTest1()
-{
- var openRequest = window.indexedDB.open("DeleteObjectStore1Database", 2);
-
- openRequest.onerror = function(event) {
- alert("Request error - " + event);
- }
- openRequest.onblocked = function(event) {
- alert("Request unexpected blocked - " + event);
- done();
- }
- openRequest.onsuccess = function(event) {
- alert("Request unexpected success - " + event);
- done();
- }
-
- openRequest.onupgradeneeded = function(event) {
- alert("Second upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
- var versionTransaction = openRequest.transaction;
- var database = event.target.result;
- var objectStore = versionTransaction.objectStore("TestObjectStore");
-
- alert("Deleting object store");
- database.deleteObjectStore("TestObjectStore");
-
- versionTransaction.abort();
-
- versionTransaction.onabort = function(event) {
- alert("Second version change transaction abort");
- continueTest2();
- database.close();
- }
-
- versionTransaction.oncomplete = function(event) {
- alert("Second version change transaction unexpected complete");
- done();
- }
-
- versionTransaction.onerror = function(event) {
- alert("Second version change transaction error - " + event);
- }
- }
-}
-
-function continueTest2()
-{
- var openRequest = window.indexedDB.open("DeleteObjectStore1Database", 1);
-
- openRequest.onerror = function(event) {
- alert("Request unexpected error - " + event);
- done();
- }
- openRequest.onblocked = function(event) {
- alert("Request unexpected blocked - " + event);
- done();
- }
- openRequest.onupgradeneeded = function(event) {
- alert("Request unexpected upgradeneeded - " + event);
- done();
- }
-
- openRequest.onsuccess = function(event) {
- alert("Success opening database connection - Starting final transaction");
- var database = event.target.result;
- var transaction = database.transaction("TestObjectStore", "readwrite");
- var objectStore = transaction.objectStore("TestObjectStore");
-
- var request;
- for (var i = 0; i < 10; ++i) {
- request = objectStore.get(i + " puts");
- request.onsuccess = getChecker;
- }
-
- transaction.onabort = function(event) {
- alert("Final transaction unexpected abort");
- done();
- }
-
- transaction.oncomplete = function(event) {
- alert("Final transaction complete");
- done();
- }
-
- transaction.onerror = function(event) {
- alert("Final transaction unexpected error - " + event);
- done();
- }
- }
-}
-</script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
+<script src="resources/deleteobjectstore-1.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderndoubleabortexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/double-abort-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/double-abort-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/double-abort-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,5 +1,12 @@
</span><ins>+This test aborts the same transaction twice, making the appropriate exception is thrown.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> ALERT: Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> ALERT: Second abort failed: Error: Failed to execute 'abort' on 'IDBTransaction': The transaction is inactive or finished.
</span><span class="cx"> ALERT: Initial upgrade versionchange transaction aborted
</span><del>-ALERT: Done
-This test aborts the same transaction twice, making the appropriate exception is thrown.
</del><ins>+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderndoubleaborthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/double-abort.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/double-abort.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/double-abort.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,47 +1,9 @@
</span><del>-This test aborts the same transaction twice, making the appropriate exception is thrown.
-<script>
-
-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- alert("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-var createRequest = window.indexedDB.open("DoubleAbortTestDatabase", 1);
-
-createRequest.onupgradeneeded = function(event) {
- alert("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- var database = event.target.result;
-
- versionTransaction.abort();
- try {
- versionTransaction.abort();
- } catch (e) {
- alert("Second abort failed: " + e);
- }
-
- versionTransaction.onabort = function(event) {
- alert("Initial upgrade versionchange transaction aborted");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- alert("Initial upgrade versionchange transaction unexpected complete");
- done();
- }
-
- versionTransaction.onerror = function(event) {
- alert("Initial upgrade versionchange transaction unexpected error" + event);
- done();
- }
-}
-
-</script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
+<script src="resources/double-abort.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderndoubleopenexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/double-open-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/double-open-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/double-open-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,4 +1,10 @@
</span><span class="cx"> This test makes sure that quickly opening the same database multiple times is successful without the backend ASSERTing or crashing.
</span><ins>+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> Second request done
</span><del>-done
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderndoubleopenhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/double-open.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/double-open.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/double-open.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,38 +1,10 @@
</span><del>-This test makes sure that quickly opening the same database multiple times is successful without the backend ASSERTing or crashing.<br>
-<div id="logger"></div>
-<script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
</ins><span class="cx">
</span><del>-function log(msg)
-{
- document.getElementById("logger").innerHTML += msg + "<br>";
-}
-
-function done()
-{
- log("done");
- if (testRunner)
- testRunner.notifyDone();
-}
-
-if (testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
-}
-
-var req1 = indexedDB.open("testDB");
-req1.onerror = function() {
- log("First request unexpected error");
- done();
-}
-
-var req2 = indexedDB.open("testDB");
-req2.onsuccess = function() {
- log("Second request done");
- done();
-}
-req2.onerror = function() {
- log("Second request unexpected error");
- done();
-}
-
-</script>
</del><ins>+<script src="resources/double-open.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderngetindexfailuresexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/get-index-failures-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/get-index-failures-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/get-index-failures-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,4 +1,8 @@
</span><span class="cx"> This tests some obvious failures that can happen while calling IDBObjectStore.index().
</span><ins>+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> Initial upgrade versionchange transaction complete
</span><span class="cx"> Got an index as expected: [object IDBIndex]
</span><span class="lines">@@ -8,5 +12,7 @@
</span><span class="cx"> Second upgrade needed: Old version - 1 New version - 2
</span><span class="cx"> Failed to get an index from a deleted object store
</span><span class="cx"> Second versionchange transaction complete
</span><del>-Done
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderngetindexfailureshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/get-index-failures.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/get-index-failures.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/get-index-failures.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,120 +1,10 @@
</span><del>-This tests some obvious failures that can happen while calling IDBObjectStore.index().<br>
-<div id="logger"></div>
-<script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
</ins><span class="cx">
</span><del>-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- log("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-function log(message)
-{
- document.getElementById("logger").innerHTML += message + "<br>";
-}
-
-var createRequest = window.indexedDB.open("IDBObjectStoreGetIndexFailuresDatabase", 1);
-var database;
-
-createRequest.onupgradeneeded = function(event) {
- log("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- database = event.target.result;
- var objectStore = database.createObjectStore("TestObjectStore");
- objectStore.createIndex("TestIndex", "foo");
-
- versionTransaction.onabort = function(event) {
- log("Initial upgrade versionchange transaction unexpected aborted");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- log("Initial upgrade versionchange transaction complete");
- continueTest1();
- }
-
- versionTransaction.onerror = function(event) {
- log("Initial upgrade versionchange transaction unexpected error" + event);
- done();
- }
-}
-
-function continueTest1()
-{
- var transaction = database.transaction("TestObjectStore", "readonly");
- var objectStore = transaction.objectStore("TestObjectStore");
-
- var index = objectStore.index("TestIndex");
- log("Got an index as expected: " + index);
-
- try {
- objectStore.index(null);
- } catch(e) {
- log("Failed to get an index with a null name");
- }
-
- try {
- objectStore.index("DoesNotExistdex");
- } catch(e) {
- log("Failed to get an index that doesn't exist");
- }
-
- transaction.onabort = function(event) {
- log("readonly transaction unexpected abort" + event);
- done();
- }
-
- transaction.oncomplete = function(event) {
- log("readonly transaction complete");
- continueTest2();
- database.close();
- }
-
- transaction.onerror = function(event) {
- log("readonly transaction unexpected error" + event);
- done();
- }
-}
-
-function continueTest2()
-{
- var createRequest = window.indexedDB.open("IDBObjectStoreGetIndexFailuresDatabase", 2);
- createRequest.onupgradeneeded = function(event) {
- log("Second upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- var database = event.target.result;
- var objectStore = versionTransaction.objectStore("TestObjectStore");
- database.deleteObjectStore("TestObjectStore");
-
- try {
- objectStore.index("TestIndex");
- } catch(e) {
- log("Failed to get an index from a deleted object store");
- }
-
- versionTransaction.onabort = function(event) {
- log("Second versionchange transaction unexpected aborted");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- log("Second versionchange transaction complete");
- done();
- }
-
- versionTransaction.onerror = function(event) {
- log("Second versionchange transaction unexpected error" + event);
- done();
- }
- }
-}
-
-</script>
</del><ins>+<script src="resources/get-index-failures.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderngetkeyrangeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/get-keyrange-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/get-keyrange-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/get-keyrange-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,3 +1,8 @@
</span><ins>+This test exercises IDBObjectStore.get() with an IDBKeyRange as the parameter.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> ALERT: Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> ALERT: Initial upgrade versionchange transaction complete
</span><span class="cx"> ALERT: Success getting keyRange [-1 (Closed), undefined (Open)]
</span><span class="lines">@@ -123,5 +128,7 @@
</span><span class="cx"> ALERT: Success getting keyRange [Fri Nov 04 1955 17:00:00 GMT-0700 (PDT) (Open), Wed Oct 21 2015 09:00:00 GMT-0700 (PDT) (Open)]
</span><span class="cx"> ALERT: Result is Fish under the sea
</span><span class="cx"> ALERT: readonly transaction complete
</span><del>-ALERT: Done
-This test exercises IDBObjectStore.get() with an IDBKeyRange as the parameter.
</del><ins>+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderngetkeyrangehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/get-keyrange.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/get-keyrange.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/get-keyrange.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,171 +1,9 @@
</span><del>-This test exercises IDBObjectStore.get() with an IDBKeyRange as the parameter.
-<script>
-
-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- alert("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-var createRequest = window.indexedDB.open("GetKeyRangeDatabase", 1);
-var database;
-
-var date1 = new Date("1955-11-05T00:00:00");
-var date2 = new Date("1955-11-12T18:00:00");
-var date3 = new Date("2015-10-21T16:00:00");
-
-createRequest.onupgradeneeded = function(event) {
- alert("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- database = event.target.result;
- var objectStore = database.createObjectStore("TestObjectStore");
-
- objectStore.put("Flux capacitor", date1);
- objectStore.put("Fish under the sea", date2);
- objectStore.put("Hoverboards", date3);
-
- for (var i = 0; i < 100; ++i)
- objectStore.put("\"" + i + "\"", i);
-
- objectStore.put("PosInf", Infinity);
- objectStore.put("NegInf", -Infinity);
-
- objectStore.put("A", "A");
- objectStore.put("As", "As");
- objectStore.put("AS", "AS");
- objectStore.put("a", "a");
-
- objectStore.put("array 1", [1, "hello"]);
- objectStore.put("array 2", [2, "goodbye"]);
- objectStore.put("array 3", []);
-
- versionTransaction.onabort = function(event) {
- alert("Initial upgrade versionchange transaction unexpected aborted");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- alert("Initial upgrade versionchange transaction complete");
- continueTest1();
- }
-
- versionTransaction.onerror = function(event) {
- alert("Initial upgrade versionchange transaction unexpected error" + event);
- done();
- }
-}
-
-var objectStore;
-
-function testGet(keyRange) {
- var request = objectStore.get(keyRange);
- request.onsuccess = function()
- {
- alert("Success getting keyRange [" + keyRange.lower + " (" + (keyRange.lowerOpen ? "Open" : "Closed") + "), " + keyRange.upper + " (" + (keyRange.upperOpen ? "Open" : "Closed") + ")]");
- alert("Result is " + request.result);
- }
- request.onerror = function()
- {
- alert("Unexpected error getting keyRange [" + keyRange.lower + " (" + keyRange.lowerOpen + "), " + keyRange.upper + " (" + keyRange.upperOpen + ")]");
- }
-}
-
-function continueTest1()
-{
- var transaction = database.transaction("TestObjectStore", "readonly");
- objectStore = transaction.objectStore("TestObjectStore");
-
- testGet(IDBKeyRange.lowerBound(-1));
- testGet(IDBKeyRange.lowerBound(-1, true));
- testGet(IDBKeyRange.lowerBound(0));
- testGet(IDBKeyRange.lowerBound(0, true));
- testGet(IDBKeyRange.lowerBound(0.1));
- testGet(IDBKeyRange.lowerBound(0.1, true));
- testGet(IDBKeyRange.lowerBound(99));
- testGet(IDBKeyRange.lowerBound(99, true));
- testGet(IDBKeyRange.lowerBound(99.1));
- testGet(IDBKeyRange.lowerBound(99.1, true));
-
- testGet(IDBKeyRange.upperBound(100));
- testGet(IDBKeyRange.upperBound(100, true));
- testGet(IDBKeyRange.upperBound(99));
- testGet(IDBKeyRange.upperBound(99, true));
- testGet(IDBKeyRange.upperBound(98.99999));
- testGet(IDBKeyRange.upperBound(98.99999, true));
- testGet(IDBKeyRange.upperBound(98));
- testGet(IDBKeyRange.upperBound(98, true));
- testGet(IDBKeyRange.upperBound(0));
- testGet(IDBKeyRange.upperBound(0, true));
- testGet(IDBKeyRange.upperBound(-0.1));
- testGet(IDBKeyRange.upperBound(-0.1, true));
-
- testGet(IDBKeyRange.bound(2.5, 3.5));
- testGet(IDBKeyRange.bound(-0.5, 0.5));
- testGet(IDBKeyRange.bound(98.5, 99.5));
- testGet(IDBKeyRange.bound(-1, 0));
- testGet(IDBKeyRange.bound(-1, 0, true));
- testGet(IDBKeyRange.bound(-1, 0, false, true));
- testGet(IDBKeyRange.bound(-1, 0, true, true));
- testGet(IDBKeyRange.bound(3, 4));
- testGet(IDBKeyRange.bound(3, 4, true));
- testGet(IDBKeyRange.bound(3, 4, false, true));
- testGet(IDBKeyRange.bound(3, 4, true, true));
- testGet(IDBKeyRange.bound(99, 100));
- testGet(IDBKeyRange.bound(99, 100, true));
- testGet(IDBKeyRange.bound(99, 100, false, true));
- testGet(IDBKeyRange.bound(99, 100, true, true));
-
- testGet(IDBKeyRange.bound(Infinity, "a"));
- testGet(IDBKeyRange.bound(Infinity, "a", true));
- testGet(IDBKeyRange.bound(Infinity, "a", false, true));
- testGet(IDBKeyRange.bound(Infinity, "a", true, true));
-
- testGet(IDBKeyRange.bound("AS", "a"));
- testGet(IDBKeyRange.bound("AS", "a", true));
- testGet(IDBKeyRange.bound("AS", "a", false, true));
- testGet(IDBKeyRange.bound("AS", "a", true, true));
-
- testGet(IDBKeyRange.bound(Infinity, []));
- testGet(IDBKeyRange.bound(Infinity, [], true));
- testGet(IDBKeyRange.bound(Infinity, [], false, true));
- testGet(IDBKeyRange.bound(Infinity, [], true, true));
-
- testGet(IDBKeyRange.bound(Infinity, "a"));
- testGet(IDBKeyRange.bound(Infinity, "a", true));
- testGet(IDBKeyRange.bound(Infinity, "a", false, true));
- testGet(IDBKeyRange.bound(Infinity, "a", true, true));
-
- testGet(IDBKeyRange.bound(Infinity, "a"));
- testGet(IDBKeyRange.bound(Infinity, "a", true));
- testGet(IDBKeyRange.bound(Infinity, "a", false, true));
- testGet(IDBKeyRange.bound(Infinity, "a", true, true));
-
- testGet(IDBKeyRange.bound(date1, date3));
- testGet(IDBKeyRange.bound(date1, date3, true));
- testGet(IDBKeyRange.bound(date1, date3, false, true));
- testGet(IDBKeyRange.bound(date1, date3, true, true));
-
- transaction.onabort = function(event) {
- alert("readonly transaction unexpected abort" + event);
- done();
- }
-
- transaction.oncomplete = function(event) {
- alert("readonly transaction complete");
- done();
- }
-
- transaction.onerror = function(event) {
- alert("readonly transaction unexpected error" + event);
- done();
- }
-}
-
-</script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
+<script src="resources/get-keyrange.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernidbdatabasedeleteobjectstorefailuresexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/idbdatabase-deleteobjectstore-failures-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/idbdatabase-deleteobjectstore-failures-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/idbdatabase-deleteobjectstore-failures-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,3 +1,8 @@
</span><ins>+This tests some obvious failures that can happen while calling IDBDatabase.deleteObjectStore()
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> ALERT: Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> ALERT: Initial upgrade versionchange transaction complete
</span><span class="cx"> ALERT: readwrite put success - about to try to delete an objectstore
</span><span class="lines">@@ -7,5 +12,7 @@
</span><span class="cx"> ALERT: Failed to deleteObjectStore with a non-existent objectstore - Error: Failed to execute 'deleteObjectStore' on 'IDBDatabase': The specified object store was not found.
</span><span class="cx"> ALERT: Failed to deleteObjectStore with an in-progress versionchange transaction that is inactive - Error: A request was placed against a transaction which is either currently not active, or which is finished.
</span><span class="cx"> ALERT: Second version change transaction complete
</span><del>-ALERT: Done
-This tests some obvious failures that can happen while calling IDBDatabase.deleteObjectStore()
</del><ins>+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernidbdatabasedeleteobjectstorefailureshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/idbdatabase-deleteobjectstore-failures.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/idbdatabase-deleteobjectstore-failures.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/idbdatabase-deleteobjectstore-failures.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,144 +1,9 @@
</span><del>-This tests some obvious failures that can happen while calling IDBDatabase.deleteObjectStore()
-<script>
-
-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- alert("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-var createRequest = window.indexedDB.open("IDBDatabaseDeleteObjectStoreFailuresDatabase", 1);
-var database;
-
-createRequest.onupgradeneeded = function(event) {
- alert("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- database = event.target.result;
- var objectStore = database.createObjectStore("TestObjectStore");
- var request = objectStore.put("bar", "foo");
-
- versionTransaction.onabort = function(event) {
- alert("Initial upgrade versionchange transaction unexpected aborted");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- alert("Initial upgrade versionchange transaction complete");
- continueTest1();
- }
-
- versionTransaction.onerror = function(event) {
- alert("Initial upgrade versionchange transaction unexpected error" + event);
- done();
- }
-}
-
-function continueTest1()
-{
- var transaction = database.transaction("TestObjectStore", "readwrite");
- var objectStore = transaction.objectStore("TestObjectStore");
- var request = objectStore.put("baz", "foo");
-
- request.onsuccess = function() {
- alert("readwrite put success - about to try to delete an objectstore");
- try {
- database.deleteObjectStore("TestObjectStore");
- } catch(e) {
- alert("Failed to deleteObjectStore without a versionchange transaction - " + e);
- }
- }
-
- transaction.onabort = function(event) {
- alert("readwrite transaction unexpected aborted");
- done();
- }
-
- transaction.oncomplete = function(event) {
- alert("readwrite transaction complete");
- database.close();
- continueTest2();
- }
-
- transaction.onerror = function(event) {
- alert("readwrite transaction unexpected error" + event);
- done();
- }
-}
-
-function continueTest2()
-{
- var openRequest = window.indexedDB.open("IDBDatabaseDeleteObjectStoreFailuresDatabase", 2);
-
- openRequest.onerror = function(event) {
- alert("Request unexpected error - " + event);
- done();
- }
- openRequest.onblocked = function(event) {
- alert("Request unexpected blocked - " + event);
- done();
- }
- openRequest.onsuccess = function(event) {
- alert("Request unexpected success - " + event);
- done();
- }
-
- openRequest.onupgradeneeded = function(event) {
- alert("Second upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = openRequest.transaction;
- database = event.target.result;
-
- try {
- database.deleteObjectStore("NonexistentObjectStore");
- } catch(e) {
- alert("Failed to deleteObjectStore with a non-existent objectstore - " + e);
- }
-
- // Spin the transaction with get requests to keep it alive long enough for the setTimeout to fire.
- var objectStore = versionTransaction.objectStore("TestObjectStore");
- var canFinish = false;
- var spinGet = function() {
- objectStore.get("foo").onsuccess = function() {
- if (!canFinish)
- spinGet();
- }
- }
- spinGet();
-
- // After the versionChange transaction becomes inactive, but while it's still in-progress, try to delete the objectstore
- var tryInactiveDelete = function()
- {
- try {
- database.deleteObjectStore("TestObjectStore");
- } catch(e) {
- alert("Failed to deleteObjectStore with an in-progress versionchange transaction that is inactive - " + e);
- }
- canFinish = true;
- }
-
- setTimeout(tryInactiveDelete, 0);
-
- versionTransaction.onabort = function(event) {
- alert("Second version change transaction unexpected abort");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- alert("Second version change transaction complete");
- done();
- }
-
- versionTransaction.onerror = function(event) {
- alert("Second version change transaction unexpected error - " + event);
- done();
- }
- }
-}
-</script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
+<script src="resources/idbdatabase-deleteobjectstore-failures.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernidbdatabasetransactionfailuresexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/idbdatabase-transaction-failures-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/idbdatabase-transaction-failures-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/idbdatabase-transaction-failures-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,3 +1,8 @@
</span><ins>+This tests some obvious failures that can happen while calling IDBDatabase.transaction()
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> ALERT: Upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> ALERT: Failed to start a transaction while a versionChange transaction was in progress - Error: Failed to execute 'transaction' on 'IDBDatabase': A version change transaction is running.
</span><span class="cx"> ALERT: versionchange transaction completed
</span><span class="lines">@@ -6,5 +11,7 @@
</span><span class="cx"> ALERT: Failed to start a transaction with an invalid mode - TypeError: Failed to execute 'transaction' on 'IDBDatabase': The mode provided ('blahblah') is not one of 'readonly' or 'readwrite'.
</span><span class="cx"> ALERT: Failed to explicitly start a versionchange transaction - TypeError: Failed to execute 'transaction' on 'IDBDatabase': The mode provided ('versionchange') is not one of 'readonly' or 'readwrite'.
</span><span class="cx"> ALERT: Failed to explicitly start a transaction with the close pending flag set - Error: Failed to execute 'transaction' on 'IDBDatabase': The database connection is closing.
</span><del>-ALERT: Done
-This tests some obvious failures that can happen while calling IDBDatabase.transaction()
</del><ins>+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernidbdatabasetransactionfailureshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/idbdatabase-transaction-failures.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/idbdatabase-transaction-failures.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/idbdatabase-transaction-failures.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,90 +1,9 @@
</span><del>-This tests some obvious failures that can happen while calling IDBDatabase.transaction()
-<script>
-
-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- alert("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-var createRequest = window.indexedDB.open("IDBDatabaseTransactionFailuresDatabase");
-var database;
-
-createRequest.onupgradeneeded = function(event) {
- alert("Upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- database = event.target.result;
- var objectStore = database.createObjectStore("TestObjectStore");
- var request = objectStore.put("foo", "bar");
-
- request.onerror = function(event) {
- alert("put FAILED - " + event);
- done();
- }
-
- try {
- database.transaction("TestObjectStore", "readonly");
- } catch(e) {
- alert("Failed to start a transaction while a versionChange transaction was in progress - " + e);
- }
-
- versionTransaction.onabort = function(event) {
- alert("versionchange transaction aborted");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- alert("versionchange transaction completed");
- continueTest();
- }
-
- versionTransaction.onerror = function(event) {
- alert("versionchange transaction error'ed - " + event);
- done();
- }
-}
-
-function continueTest()
-{
- try {
- database.transaction([], "readonly");
- } catch(e) {
- alert("Failed to start a transaction with an empty set of object stores - " + e);
- }
-
- try {
- database.transaction("NonexistentObjectStore", "readonly");
- } catch(e) {
- alert("Failed to start a transaction to a nonexistent object store - " + e);
- }
-
- try {
- database.transaction("TestObjectStore", "blahblah");
- } catch(e) {
- alert("Failed to start a transaction with an invalid mode - " + e);
- }
-
- try {
- database.transaction("TestObjectStore", "versionchange");
- } catch(e) {
- alert("Failed to explicitly start a versionchange transaction - " + e);
- }
-
- try {
- database.close();
- database.transaction("TestObjectStore", "readonly");
- } catch(e) {
- alert("Failed to explicitly start a transaction with the close pending flag set - " + e);
- }
-
- done();
-}
-
-</script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
+<script src="resources/idbdatabase-transaction-failures.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernidbindexpropertiesbasicexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/idbindex-properties-basic-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/idbindex-properties-basic-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/idbindex-properties-basic-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,3 +1,8 @@
</span><ins>+This tests getting basic properties on an IDBIndex.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> ALERT: Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> ALERT: TestIndex1
</span><span class="cx"> ALERT: [object IDBObjectStore]
</span><span class="lines">@@ -85,6 +90,7 @@
</span><span class="cx"> ALERT: false
</span><span class="cx"> ALERT: false
</span><span class="cx"> ALERT: readonly transaction complete
</span><del>-ALERT: Done
-This tests getting basic properties on an IDBIndex.
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernidbindexpropertiesbasichtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/idbindex-properties-basic.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/idbindex-properties-basic.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/idbindex-properties-basic.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,100 +1,10 @@
</span><del>-This tests getting basic properties on an IDBIndex.<br>
-<div id="logger"></div>
-<script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
</ins><span class="cx">
</span><del>-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- alert("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-function gol(message)
-{
- document.getElementById("logger").innerHTML += message + "<br>";
-}
-
-function logIndex(index)
-{
- alert(index.name);
- alert(index.objectStore);
- alert(index.objectStore.name);
- alert(index.keyPath);
- alert(index.multiEntry);
- alert(index.unique);
-}
-
-var createRequest = window.indexedDB.open("IDBIndexPropertiesBasicDatabase", 1);
-var database;
-
-var indexes = new Array();
-
-createRequest.onupgradeneeded = function(event) {
- alert("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- database = event.target.result;
- var objectStore = database.createObjectStore("TestObjectStore");
-
- indexes.push(objectStore.createIndex("TestIndex1", "foo"));
- indexes.push(objectStore.createIndex("TestIndex2", "foo", { unique: false, multiEntry: false }));
- indexes.push(objectStore.createIndex("TestIndex3", "foo", { unique: true, multiEntry: false }));
- indexes.push(objectStore.createIndex("TestIndex4", "foo", { unique: false, multiEntry: true }));
- indexes.push(objectStore.createIndex("TestIndex5", "foo", { unique: true, multiEntry: true }));
- indexes.push(objectStore.createIndex("TestIndex6", [ "foo" ]));
- indexes.push(objectStore.createIndex("TestIndex7", [ "foo", "bar" ]));
-
- for (index in indexes)
- logIndex(indexes[index]);
-
- versionTransaction.onabort = function(event) {
- alert("Initial upgrade versionchange transaction unexpected aborted");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- alert("Initial upgrade versionchange transaction complete");
- continueTest1();
- }
-
- versionTransaction.onerror = function(event) {
- alert("Initial upgrade versionchange transaction unexpected error" + event);
- done();
- }
-}
-
-function continueTest1()
-{
- var transaction = database.transaction("TestObjectStore", "readonly");
- var objectStore = transaction.objectStore("TestObjectStore");
-
- logIndex(objectStore.index("TestIndex1"));
- logIndex(objectStore.index("TestIndex2"));
- logIndex(objectStore.index("TestIndex3"));
- logIndex(objectStore.index("TestIndex4"));
- logIndex(objectStore.index("TestIndex5"));
- logIndex(objectStore.index("TestIndex6"));
- logIndex(objectStore.index("TestIndex7"));
-
- transaction.onabort = function(event) {
- alert("readonly transaction unexpected abort" + event);
- done();
- }
-
- transaction.oncomplete = function(event) {
- alert("readonly transaction complete");
- done();
- }
-
- transaction.onerror = function(event) {
- alert("readonly transaction unexpected error" + event);
- done();
- }
-}
-
-</script>
</del><ins>+<script src="resources/idbindex-properties-basic.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernidbobjectstoreclear1expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-clear-1-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-clear-1-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-clear-1-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,3 +1,8 @@
</span><ins>+This test creates an object store then populates it. It then clears it and makes sure it has nothing left in it.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> ALERT: Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> ALERT: Initial upgrade versionchange transaction complete
</span><span class="cx"> ALERT: Success opening database connection - Starting readwrite transaction
</span><span class="lines">@@ -21,7 +26,7 @@
</span><span class="cx"> ALERT: Value gotten was undefined
</span><span class="cx"> ALERT: Value gotten was undefined
</span><span class="cx"> ALERT: Readwrite transaction complete
</span><del>-ALERT: Done
-This test creates an object store then populates it.
-It then clears it and makes sure it has nothing left in it.
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernidbobjectstoreclear1html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-clear-1.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-clear-1.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-clear-1.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,111 +1,9 @@
</span><del>-This test creates an object store then populates it.<br>
-It then clears it and makes sure it has nothing left in it.<br>
-<script>
-
-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- alert("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-var createRequest = window.indexedDB.open("IDBObjectStoreClearDatabase", 1);
-
-createRequest.onupgradeneeded = function(event) {
- alert("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- var database = event.target.result;
- var objectStore = database.createObjectStore("TestObjectStore", { autoIncrement: true });
- var request = objectStore.put("bar1");
- var request = objectStore.put("bar2");
- var request = objectStore.put("bar3");
- var request = objectStore.put("bar4");
- var request = objectStore.put("bar5");
- var request = objectStore.put("bar6");
- var request = objectStore.put("bar7");
- var request = objectStore.put("bar8");
- var request = objectStore.put("bar9");
-
- versionTransaction.onabort = function(event) {
- alert("Initial upgrade versionchange transaction unexpected aborted");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- alert("Initial upgrade versionchange transaction complete");
- continueTest1();
- database.close();
- }
-
- versionTransaction.onerror = function(event) {
- alert("Initial upgrade versionchange transaction unexpected error" + event);
- done();
- }
-}
-
-function getChecker(event) {
- alert("Value gotten was " + event.target.result);
-}
-
-function continueTest1()
-{
- var openRequest = window.indexedDB.open("IDBObjectStoreClearDatabase", 1);
-
- openRequest.onerror = function(event) {
- alert("Request unexpected error - " + event);
- done();
- }
- openRequest.onblocked = function(event) {
- alert("Request unexpected blocked - " + event);
- done();
- }
- openRequest.onupgradeneeded = function(event) {
- alert("Request unexpected upgradeneeded - " + event);
- done();
- }
-
- openRequest.onsuccess = function(event) {
- alert("Success opening database connection - Starting readwrite transaction");
- var database = event.target.result;
- var transaction = database.transaction("TestObjectStore", "readwrite");
- var objectStore = transaction.objectStore("TestObjectStore");
-
- var request;
- for (var i = 1; i <= 9; ++i) {
- request = objectStore.get(i);
- request.onsuccess = getChecker;
- }
-
- request = objectStore.clear();
- request.onsuccess = function() {
- alert("Object store cleared");
- var newRequests;
- for (var i = 1; i <= 9; ++i) {
- newRequests = objectStore.get(i);
- newRequests.onsuccess = getChecker;
- }
- }
-
- transaction.onabort = function(event) {
- alert("Readwrite transaction unexpected abort");
- done();
- }
-
- transaction.oncomplete = function(event) {
- alert("Readwrite transaction complete");
- done();
- }
-
- transaction.onerror = function(event) {
- alert("Readwrite transaction unexpected error - " + event);
- done();
- }
- }
-}
-</script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
+<script src="resources/idbobjectstore-clear-1.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernidbobjectstoreclear2expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-clear-2-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-clear-2-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-clear-2-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,3 +1,8 @@
</span><ins>+This test creates an object store then populates it, then commits that transaction. It then clears it, but aborts that transaction. Finally it checks to make sure everything from step 1 is still in there.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> ALERT: Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> ALERT: Initial upgrade versionchange transaction complete
</span><span class="cx"> ALERT: Success opening database connection - Starting readwrite transaction
</span><span class="lines">@@ -32,8 +37,7 @@
</span><span class="cx"> ALERT: Value gotten was bar8
</span><span class="cx"> ALERT: Value gotten was bar9
</span><span class="cx"> ALERT: Readwrite transaction complete
</span><del>-ALERT: Done
-This test creates an object store then populates it, then commits that transaction.
-It then clears it, but aborts that transaction.
-Finally it checks to make sure everything from step 1 is still in there.
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernidbobjectstoreclear2html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-clear-2.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-clear-2.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-clear-2.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,167 +1,9 @@
</span><del>-This test creates an object store then populates it, then commits that transaction.<br>
-It then clears it, but aborts that transaction.<br>
-Finally it checks to make sure everything from step 1 is still in there.<br>
-<script>
-
-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- alert("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-var createRequest = window.indexedDB.open("IDBObjectStoreClear2Database", 1);
-
-createRequest.onupgradeneeded = function(event) {
- alert("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- var database = event.target.result;
- var objectStore = database.createObjectStore("TestObjectStore", { autoIncrement: true });
- var request = objectStore.put("bar1");
- var request = objectStore.put("bar2");
- var request = objectStore.put("bar3");
- var request = objectStore.put("bar4");
- var request = objectStore.put("bar5");
- var request = objectStore.put("bar6");
- var request = objectStore.put("bar7");
- var request = objectStore.put("bar8");
- var request = objectStore.put("bar9");
-
- versionTransaction.onabort = function(event) {
- alert("Initial upgrade versionchange transaction unexpected aborted");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- alert("Initial upgrade versionchange transaction complete");
- continueTest1();
- database.close();
- }
-
- versionTransaction.onerror = function(event) {
- alert("Initial upgrade versionchange transaction unexpected error" + event);
- done();
- }
-}
-
-function getChecker(event) {
- alert("Value gotten was " + event.target.result);
-}
-
-function continueTest1()
-{
- var openRequest = window.indexedDB.open("IDBObjectStoreClear2Database", 1);
-
- openRequest.onerror = function(event) {
- alert("Request unexpected error - " + event);
- done();
- }
- openRequest.onblocked = function(event) {
- alert("Request unexpected blocked - " + event);
- done();
- }
- openRequest.onupgradeneeded = function(event) {
- alert("Request unexpected upgradeneeded - " + event);
- done();
- }
-
- openRequest.onsuccess = function(event) {
- alert("Success opening database connection - Starting readwrite transaction");
- var database = event.target.result;
- var transaction = database.transaction("TestObjectStore", "readwrite");
- var objectStore = transaction.objectStore("TestObjectStore");
-
- var request;
- for (var i = 1; i <= 9; ++i) {
- request = objectStore.get(i);
- request.onsuccess = getChecker;
- }
-
- request = objectStore.clear();
- request.onsuccess = function() {
- alert("Object store cleared, making sure its all gone.");
- var newRequests;
- for (var i = 1; i <= 9; ++i) {
- newRequests = objectStore.get(i);
- newRequests.onsuccess = getChecker;
- }
-
- // We'll be on the last request here, can just override it.
- newRequests.onsuccess = function(event) {
- getChecker(event);
- transaction.abort();
- }
- }
-
- // Just for fun clear it twice, won't change anything
- objectStore.clear();
-
- transaction.onabort = function(event) {
- alert("Readwrite transaction abort");
- continueTest2();
- }
-
- transaction.oncomplete = function(event) {
- alert("Readwrite transaction unexpected complete");
- done();
- }
-
- transaction.onerror = function(event) {
- alert("Readwrite transaction unexpected error - " + event);
- done();
- }
- }
-}
-
-function continueTest2()
-{
- var openRequest = window.indexedDB.open("IDBObjectStoreClear2Database", 1);
-
- openRequest.onerror = function(event) {
- alert("Request unexpected error - " + event);
- done();
- }
- openRequest.onblocked = function(event) {
- alert("Request unexpected blocked - " + event);
- done();
- }
- openRequest.onupgradeneeded = function(event) {
- alert("Request unexpected upgradeneeded - " + event);
- done();
- }
-
- openRequest.onsuccess = function(event) {
- alert("Success opening database connection - Starting final transaction");
- var database = event.target.result;
- var transaction = database.transaction("TestObjectStore", "readwrite");
- var objectStore = transaction.objectStore("TestObjectStore");
-
- var request;
- for (var i = 1; i <= 9; ++i) {
- request = objectStore.get(i);
- request.onsuccess = getChecker;
- }
-
- transaction.onabort = function(event) {
- alert("Readwrite transaction unexpected abort");
- done();
- }
-
- transaction.oncomplete = function(event) {
- alert("Readwrite transaction complete");
- done();
- }
-
- transaction.onerror = function(event) {
- alert("Readwrite transaction unexpected error - " + event);
- done();
- }
- }
-}
-</script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
+<script src="resources/idbobjectstore-clear-2.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernidbobjectstorecount1expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-count-1-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-count-1-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-count-1-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,3 +1,8 @@
</span><ins>+This test exercises various uses of IDBObjectStore.count()
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> ALERT: Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> ALERT: Count is: 1
</span><span class="cx"> ALERT: Count is: 0
</span><span class="lines">@@ -50,5 +55,7 @@
</span><span class="cx"> ALERT: Count is: 3
</span><span class="cx"> ALERT: Count is: 1
</span><span class="cx"> ALERT: Initial upgrade versionchange transaction complete
</span><del>-ALERT: Done
-This test exercises various uses of IDBObjectStore.count()
</del><ins>+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernidbobjectstorecount1html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-count-1.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-count-1.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-count-1.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,92 +1,9 @@
</span><del>-This test exercises various uses of IDBObjectStore.count()
-<script>
-
-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- alert("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-var createRequest = window.indexedDB.open("IDBObjectStoreCount1Database", 1);
-var database;
-var objectStore;
-
-function getCount(arg)
-{
- var request;
- if (arg == undefined)
- request = objectStore.count();
- else
- request = objectStore.count(arg);
-
- request.onsuccess = function() {
- alert("Count is: " + request.result);
- }
- request.onerror = function(error) {
- alert("Unexpected error getting count: " + error);
- done();
- }
-}
-
-function getCounts()
-{
- getCount();
- getCount(IDBKeyRange.bound(3, 6));
- getCount(IDBKeyRange.bound(3, 6, true, false));
- getCount(IDBKeyRange.bound(3, 6, false, true));
- getCount(7);
-}
-
-createRequest.onupgradeneeded = function(event) {
- alert("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- database = event.target.result;
- objectStore = database.createObjectStore("TestObjectStore");
-
- objectStore.put(1, 1);
- getCounts();
- objectStore.put(2, 2);
- getCounts();
- objectStore.put(3, 3);
- getCounts();
- objectStore.put(4, 4);
- getCounts();
- objectStore.put(5, 5);
- getCounts();
- objectStore.put(6, 6);
- getCounts();
- objectStore.put(7, 7);
- getCounts();
- objectStore.put(8, 8);
- getCounts();
- objectStore.put(9, 9);
- getCounts();
- objectStore.put(10, 10);
- getCounts();
-
- // FIXME: Once objectStore.delete() is implemented, also test counts after deleting previous records.
-
- versionTransaction.onabort = function(event) {
- alert("Initial upgrade versionchange transaction unexpected abort");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- alert("Initial upgrade versionchange transaction complete");
- done();
- }
-
- versionTransaction.onerror = function(event) {
- alert("Initial upgrade versionchange transaction unexpected error" + event);
- done();
- }
-}
-
-</script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
+<script src="resources/idbobjectstore-count-1.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernidbobjectstorecountfailuresexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-count-failures-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-count-failures-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-count-failures-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,3 +1,8 @@
</span><ins>+This tests some obvious failures that can happen while calling IDBObjectStore.count().
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> ALERT: Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> ALERT: Failed to count records in object store with an invalid key
</span><span class="cx"> ALERT: Failed to count records in object store that's been deleted
</span><span class="lines">@@ -4,5 +9,7 @@
</span><span class="cx"> ALERT: Initial upgrade versionchange transaction complete
</span><span class="cx"> ALERT: Failed to count records in object store while transaction is inactive
</span><span class="cx"> ALERT: readonly transaction complete
</span><del>-ALERT: Done
-This tests some obvious failures that can happen while calling IDBObjectStore.count().
</del><ins>+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernidbobjectstorecountfailureshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-count-failures.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-count-failures.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-count-failures.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,105 +1,9 @@
</span><del>-This tests some obvious failures that can happen while calling IDBObjectStore.count().
-<script>
-
-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- alert("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-var createRequest = window.indexedDB.open("IDBObjectStoreCountFailuresDatabase", 1);
-var database;
-
-createRequest.onupgradeneeded = function(event) {
- alert("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- database = event.target.result;
- var objectStore = database.createObjectStore("TestObjectStore");
- var request = objectStore.put("bar", "foo");
-
- request.onsuccess = function() {
- try {
- objectStore.count(NaN);
- } catch(e) {
- alert("Failed to count records in object store with an invalid key");
- }
-
- database.deleteObjectStore("TestObjectStore");
-
- try {
- objectStore.count();
- } catch(e) {
- alert("Failed to count records in object store that's been deleted");
- }
-
- // Recreate the objectstore because we'll need it in phase 2.
- var objectStore = database.createObjectStore("TestObjectStore");
- objectStore.put("bar", "foo");
- }
-
- versionTransaction.onabort = function(event) {
- alert("Initial upgrade versionchange transaction unexpected aborted");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- alert("Initial upgrade versionchange transaction complete");
- continueTest1();
- }
-
- versionTransaction.onerror = function(event) {
- alert("Initial upgrade versionchange transaction unexpected error" + event);
- done();
- }
-}
-
-function continueTest1()
-{
- var transaction = database.transaction("TestObjectStore", "readonly");
- var objectStore = transaction.objectStore("TestObjectStore");
-
- // Spin the transaction with get requests to keep it alive long enough for the setTimeout to fire.
- var canFinish = false;
- var spinGet = function() {
- objectStore.get("foo").onsuccess = function() {
- if (!canFinish)
- spinGet();
- }
- }
- spinGet();
-
- var getWhileInactive = function() {
- try {
- objectStore.count();
- } catch(e) {
- alert("Failed to count records in object store while transaction is inactive");
- }
- canFinish = true;
- }
-
- setTimeout(getWhileInactive, 0);
-
- transaction.onabort = function(event) {
- alert("readonly transaction unexpected abort" + event);
- done();
- }
-
- transaction.oncomplete = function(event) {
- alert("readonly transaction complete");
- done();
- }
-
- transaction.onerror = function(event) {
- alert("readonly transaction unexpected error" + event);
- done();
- }
-}
-
-</script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
+<script src="resources/idbobjectstore-count-failures.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernidbobjectstoredelete1expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-delete-1-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-delete-1-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-delete-1-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,4 +1,8 @@
</span><span class="cx"> This test exercises various uses of IDBObjectStore.delete()
</span><ins>+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> Count is 113
</span><span class="cx"> Initial upgrade versionchange transaction complete
</span><span class="lines">@@ -21,5 +25,7 @@
</span><span class="cx"> Deleted "[object IDBKeyRange]", and there should now be 3 less things total.
</span><span class="cx"> Count is 4
</span><span class="cx"> readwrite transaction complete
</span><del>-Done
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernidbobjectstoredelete1html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-delete-1.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-delete-1.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-delete-1.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,140 +1,10 @@
</span><del>-This test exercises various uses of IDBObjectStore.delete()<br>
-<div id="logger"></div>
-<script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
</ins><span class="cx">
</span><del>-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function log(message)
-{
- document.getElementById("logger").innerHTML += message + "<br>";
-}
-
-function logCount()
-{
- var req = objectStore.count();
- req.onsuccess = function() {
- log("Count is " + req.result);
- }
-}
-
-function done()
-{
- log("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-var createRequest = window.indexedDB.open("IDBObjectStoreDelete1Database", 1);
-var database;
-var objectStore;
-
-var date1 = new Date("1999-12-28T23:00:00");
-var date2 = new Date("1999-12-29T23:00:00");
-var date3 = new Date("1999-12-30T23:00:00");
-var date4 = new Date("1999-12-31T23:00:00");
-var date5 = new Date("2000-01-01T00:00:00");
-var date6 = new Date("2000-01-02T00:00:00");
-var date7 = new Date("2000-01-03T00:00:00");
-var date8 = new Date("2000-01-04T00:00:00");
-
-createRequest.onupgradeneeded = function(event) {
- log("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- database = event.target.result;
- objectStore = database.createObjectStore("TestObjectStore");
-
- // Just for the heck of it.
- objectStore.delete("foo");
- objectStore.put("boo", "foo");
- objectStore.delete("foo");
-
- objectStore.put("boo", "foo");
- objectStore.put("bop", "fop");
- objectStore.put("boq", "foq");
- objectStore.put("bor", "for");
- objectStore.put("bos", "fos");
-
- for (var i = 0; i < 100; ++i)
- objectStore.put("number " + i, i);
-
- objectStore.put("date 1", date1);
- objectStore.put("date 2", date2);
- objectStore.put("date 3", date3);
- objectStore.put("date 4", date4);
- objectStore.put("date 5", date5);
- objectStore.put("date 6", date6);
- objectStore.put("date 7", date7);
- objectStore.put("date 8", date8);
-
- logCount();
-
- versionTransaction.onabort = function(event) {
- log("Initial upgrade versionchange transaction unexpected abort");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- log("Initial upgrade versionchange transaction complete");
- continueTest1();
- }
-
- versionTransaction.onerror = function(event) {
- log("Initial upgrade versionchange transaction unexpected error" + event);
- done();
- }
-}
-
-function continueTest1()
-{
- var transaction = database.transaction("TestObjectStore", "readwrite");
- objectStore = transaction.objectStore("TestObjectStore");
-
- // The pairs of things in the array are the things to delete followed by the expected decrease in the total count of objects.
- var thingsToDelete = [
- date8, 1,
- date8, 0,
- "balyhoo", 0,
- IDBKeyRange.bound(date6, date7, true, true), 0,
- IDBKeyRange.bound(date6, date7, true), 1,
- IDBKeyRange.bound(date5, date6, false, true), 1,
- IDBKeyRange.bound(date1, date6), 5,
- IDBKeyRange.bound(1, 98), 98,
- IDBKeyRange.bound("foo", "fos", true, true), 3
- ];
- var currentThing = 0;
-
- var runDeleteTests = function()
- {
- if (!thingsToDelete[currentThing])
- return;
-
- objectStore.delete(thingsToDelete[currentThing]).onsuccess = function() {
- log("Deleted \"" + thingsToDelete[currentThing] + "\", and there should now be " + thingsToDelete[currentThing + 1] + " less things total.");
- logCount();
- currentThing += 2;
- runDeleteTests();
- }
- }
- runDeleteTests();
-
- transaction.onabort = function(event) {
- log("readwrite transaction unexpected abort" + event);
- done();
- }
-
- transaction.oncomplete = function(event) {
- log("readwrite transaction complete");
- done();
- }
-
- transaction.onerror = function(event) {
- log("readwrite transaction unexpected error" + event);
- done();
- }
-}
-
-</script>
</del><ins>+<script src="resources/idbobjectstore-delete-1.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernidbobjectstoredelete2expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-delete-2-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-delete-2-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-delete-2-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,9 +1,15 @@
</span><span class="cx"> This test exercises IDBObjectStore.delete() followed by an abort to make sure the delete is un-done.
</span><ins>+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> Initial upgrade versionchange transaction complete
</span><span class="cx"> After delete, record for "foo" has value: undefined
</span><span class="cx"> readwrite transaction aborted
</span><span class="cx"> Record for "foo" has final value: bar
</span><span class="cx"> readonly transaction complete
</span><del>-Done
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernidbobjectstoredelete2html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-delete-2.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-delete-2.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-delete-2.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,114 +1,10 @@
</span><del>-This test exercises IDBObjectStore.delete() followed by an abort to make sure the delete is un-done.<br>
-<div id="logger"></div>
-<script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
</ins><span class="cx">
</span><del>-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function log(message)
-{
- document.getElementById("logger").innerHTML += message + "<br>";
-}
-
-function logCount()
-{
- var req = objectStore.count();
- req.onsuccess = function() {
- log("Count is " + req.result);
- }
-}
-
-function done()
-{
- log("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-var createRequest = window.indexedDB.open("IDBObjectStoreDelete2Database", 1);
-var database;
-
-createRequest.onupgradeneeded = function(event) {
- log("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- database = event.target.result;
- database.createObjectStore("TestObjectStore").put("bar", "foo");
-
- versionTransaction.onabort = function(event) {
- log("Initial upgrade versionchange transaction unexpected abort");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- log("Initial upgrade versionchange transaction complete");
- continueTest1();
- }
-
- versionTransaction.onerror = function(event) {
- log("Initial upgrade versionchange transaction unexpected error" + event);
- done();
- }
-}
-
-function continueTest1()
-{
- var transaction = database.transaction("TestObjectStore", "readwrite");
- transaction.objectStore("TestObjectStore").delete("foo").onsuccess = function()
- {
- var request = transaction.objectStore("TestObjectStore").get("foo");
- request.onsuccess = function()
- {
- log("After delete, record for \"foo\" has value: " + request.result);
- transaction.abort();
- }
- }
-
- transaction.onabort = function(event) {
- log("readwrite transaction aborted");
- continueTest2();
- }
-
- transaction.oncomplete = function(event) {
- log("readwrite transaction unexpected complete");
- done();
- }
-
- transaction.onerror = function(event) {
- log("readwrite transaction unexpected error");
- done();
- }
-}
-
-function continueTest2()
-{
- var transaction = database.transaction("TestObjectStore", "readonly");
-
- var request = transaction.objectStore("TestObjectStore").get("foo");
- request.onsuccess = function()
- {
- log("Record for \"foo\" has final value: " + request.result);
- }
-
- transaction.onabort = function(event)
- {
- log("readonly transaction unexpected abort");
- done();
- }
-
- transaction.oncomplete = function(event)
- {
- log("readonly transaction complete");
- done();
- }
-
- transaction.onerror = function(event)
- {
- log("readonly transaction unexpected error");
- done();
- }
-}
-
-</script>
</del><ins>+<script src="resources/idbobjectstore-delete-2.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernidbobjectstoredeletefailuresexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-delete-failures-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-delete-failures-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-delete-failures-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,4 +1,8 @@
</span><span class="cx"> This tests some obvious failures that can happen while calling IDBObjectStore.delete().
</span><ins>+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> Failed to delete record from object store with an invalid key
</span><span class="cx"> Failed to delete record from object store that has been deleted
</span><span class="lines">@@ -6,5 +10,7 @@
</span><span class="cx"> Failed to delete a record in read-only transaction
</span><span class="cx"> Failed to delete record with inactive transaction
</span><span class="cx"> readwrite transaction complete
</span><del>-Done
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernidbobjectstoredeletefailureshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-delete-failures.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-delete-failures.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-delete-failures.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,120 +1,10 @@
</span><del>-This tests some obvious failures that can happen while calling IDBObjectStore.delete().<br>
-<div id="logger"></div>
-<script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
</ins><span class="cx">
</span><del>-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function log(message)
-{
- document.getElementById("logger").innerHTML += message + "<br>";
-}
-
-function done()
-{
- log("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-var createRequest = window.indexedDB.open("IDBObjectStoreDeleteFailuresDatabase", 1);
-var database;
-
-createRequest.onupgradeneeded = function(event) {
- log("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- database = event.target.result;
- var objectStore = database.createObjectStore("TestObjectStore");
- var request = objectStore.put("bar", "foo");
-
- request.onsuccess = function() {
- try {
- objectStore.delete(NaN);
- } catch(e) {
- log("Failed to delete record from object store with an invalid key");
- }
-
- database.deleteObjectStore("TestObjectStore");
-
- try {
- objectStore.delete("foo");
- } catch(e) {
- log("Failed to delete record from object store that has been deleted");
- }
-
- // Recreate the objectstore because we'll need it in phase 2.
- var objectStore = database.createObjectStore("TestObjectStore");
- objectStore.put("bar", "foo");
- }
-
- versionTransaction.onabort = function(event) {
- log("Initial upgrade versionchange transaction unexpected aborted");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- log("Initial upgrade versionchange transaction complete");
- continueTest1();
- }
-
- versionTransaction.onerror = function(event) {
- log("Initial upgrade versionchange transaction unexpected error" + event);
- done();
- }
-}
-
-function continueTest1()
-{
- var transaction = database.transaction("TestObjectStore", "readonly");
- var objectStore = transaction.objectStore("TestObjectStore");
-
- try {
- objectStore.delete("foo");
- } catch(e) {
- log("Failed to delete a record in read-only transaction");
- }
-
- var transaction = database.transaction("TestObjectStore", "readwrite");
- var objectStore = transaction.objectStore("TestObjectStore");
-
- // Spin the transaction with get requests to keep it alive long enough for the setTimeout to fire.
- var canFinish = false;
- var spinGet = function() {
- objectStore.get("foo").onsuccess = function() {
- if (!canFinish)
- spinGet();
- }
- }
- spinGet();
-
- var testWhileInactive = function() {
- try {
- objectStore.delete("foo");
- } catch(e) {
- log("Failed to delete record with inactive transaction");
- }
- canFinish = true;
- }
-
- setTimeout(testWhileInactive, 0);
-
- transaction.onabort = function(event) {
- log("readwrite transaction unexpected abort" + event);
- done();
- }
-
- transaction.oncomplete = function(event) {
- log("readwrite transaction complete");
- done();
- }
-
- transaction.onerror = function(event) {
- log("readwrite transaction unexpected error" + event);
- done();
- }
-}
-
-</script>
</del><ins>+<script src="resources/idbobjectstore-delete-failures.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernidbobjectstoregetfailuresexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-get-failures-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-get-failures-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-get-failures-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,3 +1,8 @@
</span><ins>+This tests some obvious failures that can happen while calling IDBObjectStore.get().
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> ALERT: Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> ALERT: Failed to get record from object store with an invalid key
</span><span class="cx"> ALERT: Failed to get record from object store that has been deleted
</span><span class="lines">@@ -4,5 +9,7 @@
</span><span class="cx"> ALERT: Initial upgrade versionchange transaction complete
</span><span class="cx"> ALERT: Failed to get record from object store while the transaction is inactive
</span><span class="cx"> ALERT: readonly transaction complete
</span><del>-ALERT: Done
-This tests some obvious failures that can happen while calling IDBObjectStore.get().
</del><ins>+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernidbobjectstoregetfailureshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-get-failures.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-get-failures.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-get-failures.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,105 +1,9 @@
</span><del>-This tests some obvious failures that can happen while calling IDBObjectStore.get().
-<script>
-
-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- alert("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-var createRequest = window.indexedDB.open("IDBObjectStoreGetFailuresDatabase", 1);
-var database;
-
-createRequest.onupgradeneeded = function(event) {
- alert("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- database = event.target.result;
- var objectStore = database.createObjectStore("TestObjectStore");
- var request = objectStore.put("bar", "foo");
-
- request.onsuccess = function() {
- try {
- objectStore.get(NaN);
- } catch(e) {
- alert("Failed to get record from object store with an invalid key");
- }
-
- database.deleteObjectStore("TestObjectStore");
-
- try {
- objectStore.get("foo");
- } catch(e) {
- alert("Failed to get record from object store that has been deleted");
- }
-
- // Recreate the objectstore because we'll need it in phase 2.
- var objectStore = database.createObjectStore("TestObjectStore");
- objectStore.put("bar", "foo");
- }
-
- versionTransaction.onabort = function(event) {
- alert("Initial upgrade versionchange transaction unexpected aborted");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- alert("Initial upgrade versionchange transaction complete");
- continueTest1();
- }
-
- versionTransaction.onerror = function(event) {
- alert("Initial upgrade versionchange transaction unexpected error" + event);
- done();
- }
-}
-
-function continueTest1()
-{
- var transaction = database.transaction("TestObjectStore", "readonly");
- var objectStore = transaction.objectStore("TestObjectStore");
-
- // Spin the transaction with get requests to keep it alive long enough for the setTimeout to fire.
- var canFinish = false;
- var spinGet = function() {
- objectStore.get("foo").onsuccess = function() {
- if (!canFinish)
- spinGet();
- }
- }
- spinGet();
-
- var getWhileInactive = function() {
- try {
- objectStore.get("foo");
- } catch(e) {
- alert("Failed to get record from object store while the transaction is inactive");
- }
- canFinish = true;
- }
-
- setTimeout(getWhileInactive, 0);
-
- transaction.onabort = function(event) {
- alert("readonly transaction unexpected abort" + event);
- done();
- }
-
- transaction.oncomplete = function(event) {
- alert("readonly transaction complete");
- done();
- }
-
- transaction.onerror = function(event) {
- alert("readonly transaction unexpected error" + event);
- done();
- }
-}
-
-</script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
+<script src="resources/idbobjectstore-get-failures.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernidbobjectstoreputandclearfailuresexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-put-and-clear-failures-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-put-and-clear-failures-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-put-and-clear-failures-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,3 +1,8 @@
</span><ins>+This tests some obvious failures that can happen while calling IDBObjectStore.put() and IDBObjectStore.clear().
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> ALERT: Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> ALERT: Failed to put record into object store with an invalid key
</span><span class="cx"> ALERT: Failed to put record into object store that has been deleted
</span><span class="lines">@@ -7,5 +12,7 @@
</span><span class="cx"> ALERT: Failed to put record into object store with inactive transaction
</span><span class="cx"> ALERT: Failed to clear object store with inactive transaction
</span><span class="cx"> ALERT: readwrite transaction complete
</span><del>-ALERT: Done
-This tests some obvious failures that can happen while calling IDBObjectStore.put() and IDBObjectStore.clear().
</del><ins>+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernidbobjectstoreputandclearfailureshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-put-and-clear-failures.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-put-and-clear-failures.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-put-and-clear-failures.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,127 +1,9 @@
</span><del>-This tests some obvious failures that can happen while calling IDBObjectStore.put() and IDBObjectStore.clear().
-<script>
-
-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- alert("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-var createRequest = window.indexedDB.open("IDBObjectStorePutAndClearFailuresDatabase", 1);
-var database;
-
-createRequest.onupgradeneeded = function(event) {
- alert("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- database = event.target.result;
- var objectStore = database.createObjectStore("TestObjectStore");
- var request = objectStore.put("bar", "foo");
-
- request.onsuccess = function() {
- try {
- objectStore.put("bar", NaN);
- } catch(e) {
- alert("Failed to put record into object store with an invalid key");
- }
-
- database.deleteObjectStore("TestObjectStore");
-
- try {
- objectStore.put("bar", "foo");
- } catch(e) {
- alert("Failed to put record into object store that has been deleted");
- }
-
- try {
- objectStore.clear();
- } catch(e) {
- alert("Failed to clear object store that has been deleted");
- }
-
- // Recreate the objectstore because we'll need it in phase 2.
- var objectStore = database.createObjectStore("TestObjectStore");
- objectStore.put("bar", "foo");
- }
-
- versionTransaction.onabort = function(event) {
- alert("Initial upgrade versionchange transaction unexpected aborted");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- alert("Initial upgrade versionchange transaction complete");
- continueTest1();
- }
-
- versionTransaction.onerror = function(event) {
- alert("Initial upgrade versionchange transaction unexpected error" + event);
- done();
- }
-}
-
-function continueTest1()
-{
- var transaction = database.transaction("TestObjectStore", "readonly");
- var objectStore = transaction.objectStore("TestObjectStore");
-
- try {
- objectStore.clear();
- } catch(e) {
- alert("Failed to clear object store in read-only transaction");
- }
-
- var transaction = database.transaction("TestObjectStore", "readwrite");
- var objectStore = transaction.objectStore("TestObjectStore");
-
- // Spin the transaction with get requests to keep it alive long enough for the setTimeout to fire.
- var canFinish = false;
- var spinGet = function() {
- objectStore.get("foo").onsuccess = function() {
- if (!canFinish)
- spinGet();
- }
- }
- spinGet();
-
- var testWhileInactive = function() {
- try {
- objectStore.put("bar", "foo");
- } catch(e) {
- alert("Failed to put record into object store with inactive transaction");
- }
-
- try {
- objectStore.clear();
- } catch(e) {
- alert("Failed to clear object store with inactive transaction");
- }
-
- canFinish = true;
- }
-
- setTimeout(testWhileInactive, 0);
-
- transaction.onabort = function(event) {
- alert("readwrite transaction unexpected abort" + event);
- done();
- }
-
- transaction.oncomplete = function(event) {
- alert("readwrite transaction complete");
- done();
- }
-
- transaction.onerror = function(event) {
- alert("readwrite transaction unexpected error" + event);
- done();
- }
-}
-
-</script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
+<script src="resources/idbobjectstore-put-and-clear-failures.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernidbtransactionobjectstorefailuresexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/idbtransaction-objectstore-failures-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/idbtransaction-objectstore-failures-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/idbtransaction-objectstore-failures-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,3 +1,8 @@
</span><ins>+This tests some obvious failures that can happen while calling transaction.objectStore()
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> ALERT: Upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> ALERT: [object IDBTransaction] - versionchange
</span><span class="cx"> ALERT: [object IDBDatabase]
</span><span class="lines">@@ -7,6 +12,7 @@
</span><span class="cx"> ALERT: Caught attempt to access valid object store on a transaction that is already finishing
</span><span class="cx"> ALERT: put failed (because transaction was aborted)
</span><span class="cx"> ALERT: First version change transaction unexpected error - [object Event]
</span><del>-ALERT: Done
-This tests some obvious failures that can happen while calling transaction.objectStore()
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernidbtransactionobjectstorefailureshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/idbtransaction-objectstore-failures.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/idbtransaction-objectstore-failures.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/idbtransaction-objectstore-failures.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,78 +1,9 @@
</span><del>-This tests some obvious failures that can happen while calling transaction.objectStore()<br>
-<script>
-
-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-var request = window.indexedDB.open("TransactionObjectStoreFailuresTestDatabase");
-
-function done()
-{
- alert("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-request.onupgradeneeded = function(event)
-{
- alert("Upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var tx = request.transaction;
- var db = event.target.result;
-
- alert(tx + " - " + tx.mode);
- alert(db);
-
- var os1 = db.createObjectStore("TestObjectStore1");
- var os2 = db.createObjectStore("TestObjectStore2");
-
- var putRequest = os1.put("bar", "foo");
-
- putRequest.onerror = function() {
- alert("put failed (because transaction was aborted)");
- }
-
- try {
- tx.objectStore("");
- } catch(e) {
- alert("Caught attempt to access empty-named object store on the transaction");
- }
-
- try {
- tx.objectStore();
- } catch(e) {
- alert("Caught attempt to access null-named object store on the transaction");
- }
-
- try {
- tx.objectStore("ThisObjectStoreDoesNotExist");
- } catch(e) {
- alert("Caught attempt to access non-existant object store on the transaction");
- }
-
- tx.abort();
-
- try {
- tx.objectStore("TestObjectStore1");
- } catch(e) {
- alert("Caught attempt to access valid object store on a transaction that is already finishing");
- }
-
- tx.onabort = function(event) {
- alert("First version change transaction abort");
- done();
- }
-
- tx.oncomplete = function(event) {
- alert("First version change transaction unexpected complete");
- done();
- }
-
- tx.onerror = function(event) {
- alert("First version change transaction unexpected error - " + event);
- done();
- }
-}
-</script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
+<script src="resources/idbtransaction-objectstore-failures.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernindex1expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/index-1-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/index-1-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/index-1-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,4 +1,8 @@
</span><span class="cx"> This tests the expected values from some more complex index situations.
</span><ins>+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> get "good" result is: [object Object]
</span><span class="cx"> bar is good
</span><span class="lines">@@ -132,5 +136,7 @@
</span><span class="cx"> count result is: 11
</span><span class="cx">
</span><span class="cx"> Initial upgrade versionchange transaction complete
</span><del>-Done
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernindex1html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/index-1.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/index-1.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/index-1.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,106 +1,10 @@
</span><del>-This tests the expected values from some more complex index situations.<br>
-<div id="logger"></div>
-<script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
</ins><span class="cx">
</span><del>-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- log("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-function log(message)
-{
- document.getElementById("logger").innerHTML += message + "<br>";
-}
-
-var createRequest = window.indexedDB.open("Index1Database", 1);
-
-function checkKey(index, key)
-{
- var request1 = index.get(key);
- var request2 = index.getKey(key);
-
- request1.onsuccess = function() {
- log("get \"" + key + "\" result is: " + request1.result);
- for (n in request1.result)
- log(n + " is " + request1.result[n]);
- }
- request2.onsuccess = function() {
- log("getKey \"" + key + "\" result is: " + request2.result);
- for (n in request2.result)
- log(n + " is " + request2.result[n]);
- }
-}
-
-function checkIndex(index)
-{
- checkKey(index, "good");
- checkKey(index, "bad");
- checkKey(index, "ok");
- checkKey(index, "meh");
- checkKey(index, "super");
- checkKey(index, "thanksForAsking");
- checkKey(index, [ "good", "bad" ]);
- checkKey(index, [ "ok", "meh" ]);
- checkKey(index, [ "super", "thanksForAsking" ]);
- checkKey(index, "This is to test");
- checkKey(index, "multiEntry indexes");
- checkKey(index, ["This is to test", "multiEntry indexes" ]);
-
- var request = index.count();
- request.onsuccess = function() {
- log("count result is: " + request.result);
- log(" ");
- }
-}
-
-createRequest.onupgradeneeded = function(event) {
- log("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- var database = event.target.result;
- var objectStore = database.createObjectStore("TestObjectStore");
- var index1 = objectStore.createIndex("TestIndex1", "bar");
- var index2 = objectStore.createIndex("TestIndex2", "baz");
- var index3 = objectStore.createIndex("TestIndex3", [ "bar", "baz" ]);
- var index4 = objectStore.createIndex("TestIndex4", "bar", { multiEntry: true });
-
- objectStore.put({ bar: "good", baz: "bad" }, 1);
- objectStore.put({ bar: "good", baz: "bad" }, 2);
- objectStore.put({ bar: "good", baz: "bad" }, 3);
- objectStore.put({ bar: "ok", baz: "meh" }, 4);
- objectStore.put({ bar: "ok", baz: "meh" }, 5);
- objectStore.put({ bar: "ok", baz: "meh" }, 6);
- objectStore.put({ bar: "super", baz: "thanksForAsking" }, 7);
- objectStore.put({ bar: "super", baz: "thanksForAsking" }, 8);
- objectStore.put({ bar: "super", baz: "thanksForAsking" }, 9);
- objectStore.put({ bar: [ "This is to test", "multiEntry indexes" ]}, 10);
-
- checkIndex(index1);
- checkIndex(index2);
- checkIndex(index3);
- checkIndex(index4);
-
- versionTransaction.onabort = function(event) {
- log("Initial upgrade versionchange transaction unexpected aborted");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- log("Initial upgrade versionchange transaction complete");
- done();
- }
-
- versionTransaction.onerror = function(event) {
- log("Initial upgrade versionchange transaction unexpected error" + event);
- done();
- }
-}
-
-</script>
</del><ins>+<script src="resources/index-1.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernindex2expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/index-2-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/index-2-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/index-2-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,4 +1,8 @@
</span><span class="cx"> This tests indexes are left in appropriate states after aborted transactions.
</span><ins>+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> get "good" result is: [object Object]
</span><span class="cx"> bar is good
</span><span class="lines">@@ -146,5 +150,7 @@
</span><span class="cx"> count result is: 3
</span><span class="cx">
</span><span class="cx"> readwrite transaction complete
</span><del>-Done
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernindex2html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/index-2.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/index-2.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/index-2.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,165 +1,10 @@
</span><del>-This tests indexes are left in appropriate states after aborted transactions.<br>
-<div id="logger"></div>
-<script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
</ins><span class="cx">
</span><del>-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- log("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-function log(message)
-{
- document.getElementById("logger").innerHTML += message + "<br>";
-}
-
-var createRequest = window.indexedDB.open("Index2Database", 1);
-
-function checkKey(index, key)
-{
- var request1 = index.get(key);
- var request2 = index.getKey(key);
-
- request1.onsuccess = function() {
- log("get \"" + key + "\" result is: " + request1.result);
- for (n in request1.result)
- log(n + " is " + request1.result[n]);
- }
- request2.onsuccess = function() {
- log("getKey \"" + key + "\" result is: " + request2.result);
- for (n in request2.result)
- log(n + " is " + request2.result[n]);
- }
-}
-
-function checkIndex(index)
-{
- checkKey(index, "good");
- checkKey(index, "bad");
- checkKey(index, "multiEntry");
- checkKey(index, "test");
-
- var request = index.count();
- request.onsuccess = function() {
- log("count result is: " + request.result);
- log(" ");
- }
-}
-
-var database;
-
-createRequest.onupgradeneeded = function(event) {
- log("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- database = event.target.result;
- var objectStore = database.createObjectStore("TestObjectStore");
- var index1 = objectStore.createIndex("TestIndex1", "bar");
- var index2 = objectStore.createIndex("TestIndex2", "baz");
- var index3 = objectStore.createIndex("TestIndex3", "bar", { multiEntry: true });
-
- objectStore.put({ bar: "good", baz: "bad" }, 1);
- objectStore.put({ bar: [ "multiEntry", "test" ]}, 2);
-
- checkIndex(index1);
- checkIndex(index2);
- checkIndex(index3);
-
- versionTransaction.onabort = function(event) {
- log("Initial upgrade versionchange transaction unexpected abort");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- log("Initial upgrade versionchange transaction complete");
- continueTest1();
- }
-
- versionTransaction.onerror = function(event) {
- log("Initial upgrade versionchange transaction unexpected error" + event);
- done();
- }
-}
-
-function continueTest1()
-{
- var transaction = database.transaction("TestObjectStore", "readwrite");
- var objectStore = transaction.objectStore("TestObjectStore");
- var index1 = objectStore.index("TestIndex1");
- var index2 = objectStore.index("TestIndex2");
- var index3 = objectStore.index("TestIndex3");
-
- objectStore.delete(1).onsuccess = function() {
- log("Deleted key 1 from objectstore");
- log("");
- }
-
- checkIndex(index1);
- checkIndex(index2);
- checkIndex(index3);
-
- objectStore.clear().onsuccess = function() {
- log("Cleared objectstore");
- log("");
- }
-
- checkIndex(index1);
- checkIndex(index2);
- checkIndex(index3);
-
- objectStore.get(0).onsuccess = function() {
- log("All done. Moving on to final part");
- transaction.abort();
- }
-
- transaction.onabort = function(event) {
- log("readwrite transaction aborted");
- continueTest2();
- }
-
- transaction.oncomplete = function(event) {
- log("readwrite transaction unexpected complete");
- done();
- }
-
- transaction.onerror = function(event) {
- log("readwrite transaction unexpected error");
- done();
- }
-}
-
-function continueTest2()
-{
- var transaction = database.transaction("TestObjectStore", "readonly");
- var objectStore = transaction.objectStore("TestObjectStore");
- var index1 = objectStore.index("TestIndex1");
- var index2 = objectStore.index("TestIndex2");
- var index3 = objectStore.index("TestIndex3");
-
- checkIndex(index1);
- checkIndex(index2);
- checkIndex(index3);
-
- transaction.onabort = function(event) {
- log("readwrite transaction unexpected abort");
- done();
- }
-
- transaction.oncomplete = function(event) {
- log("readwrite transaction complete");
- done();
- }
-
- transaction.onerror = function(event) {
- log("readwrite transaction unexpected error");
- done();
- }
-}
-
-</script>
</del><ins>+<script src="resources/index-2.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernindex3expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/index-3-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/index-3-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/index-3-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,4 +1,8 @@
</span><span class="cx"> This test exercises the "unique" constraint of indexes.
</span><ins>+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> First put success
</span><span class="cx"> Value of 1 is: [object Object]
</span><span class="lines">@@ -19,5 +23,7 @@
</span><span class="cx"> Count in index 1 is: 1
</span><span class="cx"> Count in index 2 is: 1
</span><span class="cx"> Initial upgrade versionchange transaction complete
</span><del>-Done
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernindex3html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/index-3.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/index-3.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/index-3.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,117 +1,10 @@
</span><del>-This test exercises the "unique" constraint of indexes.<br>
-<div id="logger"></div>
-<script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
</ins><span class="cx">
</span><del>-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- log("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-function log(message)
-{
- document.getElementById("logger").innerHTML += message + "<br>";
-}
-
-var createRequest = window.indexedDB.open("Index3Database", 1);
-var objectStore;
-
-function checkObjectStore()
-{
- var req1 = objectStore.get(1);
- req1.onsuccess = function() {
- log("Value of 1 is: " + req1.result);
- }
- var req2 = objectStore.get(2);
- req2.onsuccess = function() {
- log("Value of 2 is: " + req2.result);
- }
- var req3 = objectStore.get(3);
- req3.onsuccess = function() {
- log("Value of 3 is: " + req3.result);
- }
-}
-
-function checkIndex(index, name)
-{
- var req = index.count();
- req.onsuccess = function() {
- log("Count in index " + name + " is: " + req.result);
- }
-}
-
-createRequest.onupgradeneeded = function(event) {
- log("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- var database = event.target.result;
- objectStore = database.createObjectStore("TestObjectStore");
- var i1 = objectStore.createIndex("TestIndex1", "bar", { unique: true });
- var i2 = objectStore.createIndex("TestIndex2", "bar", { multiEntry: true, unique: true });
-
- var request1 = objectStore.put({ bar: "good", baz: "bad" }, 1);
- request1.onsuccess = function() {
- log("First put success");
- }
- request1.onerror = function() {
- log("First put unexpected failure");
- done();
- }
-
- checkObjectStore();
- checkIndex(i1, 1);
- checkIndex(i2, 2);
-
- var request2 = objectStore.put({ bar: "good", baz: "bad" }, 2);
- request2.onsuccess = function() {
- log("Second put unexpected success");
- done();
- }
- request2.onerror = function(e) {
- log("Second put failure");
- e.stopPropagation();
- e.preventDefault();
- }
-
- checkObjectStore();
- checkIndex(i1, 1);
- checkIndex(i2, 2);
-
- var request3 = objectStore.put({ bar: [ "gnarly", "great", "good" ]}, 3);
- request3.onsuccess = function() {
- log("Third put unexpected success");
- done();
- }
- request3.onerror = function(e) {
- log("Third put failure");
- e.stopPropagation();
- e.preventDefault();
- }
-
- checkObjectStore();
- checkIndex(i1, 1);
- checkIndex(i2, 2);
-
- versionTransaction.onabort = function(event) {
- log("Initial upgrade versionchange transaction unexpected aborted");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- log("Initial upgrade versionchange transaction complete");
- done();
- }
-
- versionTransaction.onerror = function(event) {
- log("Initial upgrade versionchange transaction unexpected error" + event);
- done();
- }
-}
-
-</script>
</del><ins>+<script src="resources/index-3.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernindex4expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/index-4-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/index-4-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/index-4-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,4 +1,8 @@
</span><span class="cx"> This tests that indexes added to an object store with existing records are populated upon their creation.
</span><ins>+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> Count is: 18
</span><span class="cx"> Cursor at record: A / 1
</span><span class="lines">@@ -19,5 +23,7 @@
</span><span class="cx"> Cursor at record: H / 16
</span><span class="cx"> Cursor at record: I / 17
</span><span class="cx"> Cursor at record: I / 18
</span><del>-Done
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernindex4html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/index-4.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/index-4.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/index-4.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,97 +1,10 @@
</span><del>-This tests that indexes added to an object store with existing records are populated upon their creation.<br>
-<div id="logger"></div>
-<script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
</ins><span class="cx">
</span><del>-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- log("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-function log(message)
-{
- document.getElementById("logger").innerHTML += message + "<br>";
-}
-
-var index;
-var objectStore;
-
-function checkIndexValues()
-{
- var countRequest = index.count();
- countRequest.onsuccess = function() {
- log("Count is: " + countRequest.result);
- }
-
- var cursorRequest = index.openCursor();
- cursorRequest.onsuccess = function() {
- var cursor = cursorRequest.result;
- if (!cursor) {
- done();
- return;
- }
- log("Cursor at record: " + cursor.key + " / " + cursor.primaryKey);
- cursor.continue();
-
- }
- cursorRequest.onerror = function(e) {
- log("Unexpected error opening or iterating cursor");
- logCursor(cursorRequest.result);
- done();
- }
-}
-
-var createRequest = window.indexedDB.open("Index4Database", 1);
-createRequest.onupgradeneeded = function(event) {
- log("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- var database = event.target.result;
- objectStore = database.createObjectStore("TestObjectStore");
- objectStore.put({ bar: "A" }, 1);
- objectStore.put({ bar: "A" }, 2);
- objectStore.put({ bar: "B" }, 3);
- objectStore.put({ bar: "B" }, 4);
- objectStore.put({ bar: "C" }, 5);
- objectStore.put({ bar: "C" }, 6);
- objectStore.put({ bar: "D" }, 7);
- objectStore.put({ bar: "D" }, 8);
- objectStore.put({ bar: "E" }, 9);
- objectStore.put({ bar: "E" }, 10);
- objectStore.put({ bar: "F" }, 11);
- objectStore.put({ bar: "F" }, 12);
- objectStore.put({ bar: "G" }, 13);
- objectStore.put({ bar: "G" }, 14);
- objectStore.put({ bar: "H" }, 15);
- objectStore.put({ bar: "H" }, 16);
- objectStore.put({ bar: "I" }, 17);
- objectStore.put({ bar: "I" }, 18);
-
- // This index should be populated with the above values upon its creation.
- index = objectStore.createIndex("TestIndex1", "bar");
-
- checkIndexValues();
-
- versionTransaction.onabort = function(event) {
- log("Initial upgrade versionchange transaction unexpected aborted");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- log("Initial upgrade versionchange transaction complete");
- done();
- }
-
- versionTransaction.onerror = function(event) {
- log("Initial upgrade versionchange transaction unexpected error" + event);
- done();
- }
-}
-
-</script>
</del><ins>+<script src="resources/index-4.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernindex5expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/index-5-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/index-5-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/index-5-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,8 +1,13 @@
</span><del>-This tests creating an index on an object store that already has records, and those records would violate the unique constraint of the index.
-(The index creation should fail).
</del><ins>+This tests creating an index on an object store that already has records, and those records would violate the unique constraint of the index. (The index creation should fail).
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> Error getting cursor count
</span><span class="cx"> Error opening or iterating cursor
</span><span class="cx"> Initial upgrade versionchange transaction aborted (expected because index creation failed, and that should've caused transaction abort)
</span><del>-Done
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernindex5html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/index-5.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/index-5.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/index-5.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,85 +1,10 @@
</span><del>-This tests creating an index on an object store that already has records, and those records would violate the unique constraint of the index.<br>
-(The index creation should fail).<br>
-<div id="logger"></div>
-<script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
</ins><span class="cx">
</span><del>-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- log("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-function log(message)
-{
- document.getElementById("logger").innerHTML += message + "<br>";
-}
-
-var index;
-var objectStore;
-
-function checkIndexValues()
-{
- var countRequest = index.count();
- countRequest.onsuccess = function() {
- log("Count is: " + countRequest.result);
- }
- countRequest.onerror = function(e) {
- log("Error getting cursor count");
- e.stopPropagation();
- }
-
- var cursorRequest = index.openCursor();
- cursorRequest.onsuccess = function() {
- var cursor = cursorRequest.result;
- log("Cursor at record: " + cursor.key + " / " + cursor.primaryKey);
-
- if (cursor.key != undefined)
- cursor.continue();
- else
- done();
- }
- cursorRequest.onerror = function(e) {
- log("Error opening or iterating cursor");
- e.stopPropagation();
- }
-}
-
-var createRequest = window.indexedDB.open("Index5Database", 1);
-createRequest.onupgradeneeded = function(event) {
- log("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- var database = event.target.result;
- objectStore = database.createObjectStore("TestObjectStore");
- objectStore.put({ bar: "A" }, 1);
- objectStore.put({ bar: "A" }, 2);
-
- // This index should be populated with the above values upon its creation, but that should fail because
- // of constraint violations.
- index = objectStore.createIndex("TestIndex1", "bar", { unique: true });
-
- checkIndexValues();
-
- versionTransaction.onabort = function(event) {
- log("Initial upgrade versionchange transaction aborted (expected because index creation failed, and that should've caused transaction abort)");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- log("Initial upgrade versionchange transaction unexpected complete");
- done();
- }
-
- versionTransaction.onerror = function(event) {
- log("Initial upgrade versionchange transaction unexpected error" + event);
- done();
- }
-}
-
-</script>
</del><ins>+<script src="resources/index-5.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernindexcursor1expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/index-cursor-1-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/index-cursor-1-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/index-cursor-1-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,4 +1,8 @@
</span><span class="cx"> This tests cursors that iterate over entire indexes.
</span><ins>+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx">
</span><span class="cx"> Starting a new cursor: testCursorDirection(index1, 'next')
</span><span class="lines">@@ -402,5 +406,7 @@
</span><span class="cx"> Cursor key is: a
</span><span class="cx"> Cursor primary key is: 1
</span><span class="cx"> Cursor value is: [object Object]
</span><del>-Done
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernindexcursor1html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/index-cursor-1.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/index-cursor-1.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/index-cursor-1.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,134 +1,10 @@
</span><del>-This tests cursors that iterate over entire indexes.<br>
-<div id="logger"></div>
-<script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
</ins><span class="cx">
</span><del>-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- log("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-function log(message)
-{
- document.getElementById("logger").innerHTML += message + "<br>";
-}
-
-function logCursor(cursor)
-{
- log("Cursor direction is: " + cursor.direction);
- log("Cursor source is: " + cursor.source.name);
- log("Cursor key is: " + cursor.key);
- log("Cursor primary key is: " + cursor.primaryKey);
- log("Cursor value is: " + cursor.value);
-}
-
-function setupRequest(request)
-{
- request.onsuccess = function() {
- if (!request.result) {
- startNextCursor();
- return;
- }
- log("Success opening or iterating cursor");
- logCursor(request.result);
- request.result.continue();
- }
- request.onerror = function(e) {
- log("Unexpected error opening or iterating cursor");
- logCursor(request.result);
- done();
- }
-}
-
-function testCursorDirection(index, direction)
-{
- var range = IDBKeyRange.lowerBound(-Infinity);
- var request = index.openCursor(range, direction);
- setupRequest(request);
-}
-
-var index1;
-var index2;
-
-var cursorCommands = [
- "testCursorDirection(index2, 'prevunique')",
- "testCursorDirection(index1, 'prevunique')",
- "testCursorDirection(index2, 'prev')",
- "testCursorDirection(index1, 'prev')",
- "testCursorDirection(index2, 'nextunique')",
- "testCursorDirection(index1, 'nextunique')",
- "testCursorDirection(index2, 'next')",
- "testCursorDirection(index1, 'next')",
-];
-
-function startNextCursor()
-{
- if (!cursorCommands.length) {
- done();
- return;
- }
-
- var command = cursorCommands.pop();
- log ("");
- log("Starting a new cursor: " + command);
- eval(command);
-}
-
-var createRequest = window.indexedDB.open("IndexCursor1Database", 1);
-createRequest.onupgradeneeded = function(event) {
- log("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- var database = event.target.result;
- var objectStore = database.createObjectStore("TestObjectStore");
- index1 = objectStore.createIndex("TestIndex1", "bar");
- index2 = objectStore.createIndex("TestIndex2", "baz");
-
- objectStore.put({ bar: "A", baz: "a" }, 1);
- objectStore.put({ bar: "A", baz: "a" }, 3);
- objectStore.put({ bar: "A", baz: "a" }, 2);
- objectStore.put({ bar: "B", baz: "b" }, 5);
- objectStore.put({ bar: "B", baz: "b" }, 6);
- objectStore.put({ bar: "B", baz: "b" }, 4);
- objectStore.put({ bar: "C", baz: "c" }, 7);
- objectStore.put({ bar: "C", baz: "c" }, 9);
- objectStore.put({ bar: "C", baz: "c" }, 8);
- objectStore.put({ bar: "D", baz: "d" }, 11);
- objectStore.put({ bar: "D", baz: "d" }, 12);
- objectStore.put({ bar: "D", baz: "d" }, 10);
-
- var req1 = index1.count();
- req1.onsuccess = function() {
- log("TestIndex1 count is: " + req1.result);
- }
-
- var req2 = index2.count();
- req2.onsuccess = function() {
- log("TestIndex2 count is: " + req2.result);
- }
-
- startNextCursor();
-
- versionTransaction.onabort = function(event) {
- log("Initial upgrade versionchange transaction unexpected aborted");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- log("Initial upgrade versionchange transaction complete");
- done();
- }
-
- versionTransaction.onerror = function(event) {
- log("Initial upgrade versionchange transaction unexpected error" + event);
- done();
- }
-}
-
-</script>
</del><ins>+<script src="resources/index-cursor-1.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernindexcursor2expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/index-cursor-2-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/index-cursor-2-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/index-cursor-2-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,4 +1,8 @@
</span><span class="cx"> This tests cursors that iterate over parts of indexes.
</span><ins>+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx">
</span><span class="cx"> Starting a new cursor: testCursorDirection('next', IDBKeyRange.bound('B', 'D', true, true))
</span><span class="lines">@@ -425,5 +429,7 @@
</span><span class="cx"> Cursor key is: B
</span><span class="cx"> Cursor primary key is: 4
</span><span class="cx"> Cursor value is: [object Object]
</span><del>-Done
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernindexcursor2html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/index-cursor-2.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/index-cursor-2.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/index-cursor-2.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,138 +1,10 @@
</span><del>-This tests cursors that iterate over parts of indexes.<br>
-<div id="logger"></div>
-<script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
</ins><span class="cx">
</span><del>-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- log("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-function log(message)
-{
- document.getElementById("logger").innerHTML += message + "<br>";
-}
-
-function logCursor(cursor)
-{
- log("Cursor direction is: " + cursor.direction);
- log("Cursor source is: " + cursor.source.name);
- log("Cursor key is: " + cursor.key);
- log("Cursor primary key is: " + cursor.primaryKey);
- log("Cursor value is: " + cursor.value);
-}
-
-function setupRequest(request)
-{
- request.onsuccess = function() {
- if (!request.result) {
- startNextCursor();
- return;
- }
- log("Success opening or iterating cursor");
- logCursor(request.result);
- request.result.continue();
- }
- request.onerror = function(e) {
- log("Unexpected error opening or iterating cursor");
- logCursor(request.result);
- done();
- }
-}
-
-var index;
-
-function testCursorDirection(direction, range)
-{
- var request = index.openCursor(range, direction);
- setupRequest(request);
-}
-
-var cursorCommands = [
- "testCursorDirection('prevunique', IDBKeyRange.only('B'))",
- "testCursorDirection('prev', IDBKeyRange.only('B'))",
- "testCursorDirection('nextunique', IDBKeyRange.only('B'))",
- "testCursorDirection('next', IDBKeyRange.only('B'))",
- "testCursorDirection('prevunique', IDBKeyRange.lowerBound('C'))",
- "testCursorDirection('prev', IDBKeyRange.lowerBound('C'))",
- "testCursorDirection('nextunique', IDBKeyRange.lowerBound('C'))",
- "testCursorDirection('next', IDBKeyRange.lowerBound('C'))",
- "testCursorDirection('prevunique', IDBKeyRange.upperBound('B'))",
- "testCursorDirection('prev', IDBKeyRange.upperBound('B'))",
- "testCursorDirection('nextunique', IDBKeyRange.upperBound('B'))",
- "testCursorDirection('next', IDBKeyRange.upperBound('B'))",
- "testCursorDirection('prevunique', IDBKeyRange.bound('B', 'C'))",
- "testCursorDirection('prev', IDBKeyRange.bound('B', 'C'))",
- "testCursorDirection('nextunique', IDBKeyRange.bound('B', 'C'))",
- "testCursorDirection('next', IDBKeyRange.bound('B', 'C'))",
- "testCursorDirection('prevunique', IDBKeyRange.bound('B', 'D', true, true))",
- "testCursorDirection('prev', IDBKeyRange.bound('B', 'D', true, true))",
- "testCursorDirection('nextunique', IDBKeyRange.bound('B', 'D', true, true))",
- "testCursorDirection('next', IDBKeyRange.bound('B', 'D', true, true))",
-];
-
-function startNextCursor()
-{
- if (!cursorCommands.length) {
- done();
- return;
- }
-
- var command = cursorCommands.pop();
- log ("");
- log("Starting a new cursor: " + command);
- eval(command);
-}
-
-var createRequest = window.indexedDB.open("IndexCursor2Database", 1);
-createRequest.onupgradeneeded = function(event) {
- log("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- var database = event.target.result;
- var objectStore = database.createObjectStore("TestObjectStore");
- index = objectStore.createIndex("TestIndex1", "bar");
-
- objectStore.put({ bar: "A", baz: "a" }, 1);
- objectStore.put({ bar: "A", baz: "a" }, 3);
- objectStore.put({ bar: "A", baz: "a" }, 2);
- objectStore.put({ bar: "B", baz: "b" }, 5);
- objectStore.put({ bar: "B", baz: "b" }, 6);
- objectStore.put({ bar: "B", baz: "b" }, 4);
- objectStore.put({ bar: "C", baz: "c" }, 7);
- objectStore.put({ bar: "C", baz: "c" }, 9);
- objectStore.put({ bar: "C", baz: "c" }, 8);
- objectStore.put({ bar: "D", baz: "d" }, 11);
- objectStore.put({ bar: "D", baz: "d" }, 12);
- objectStore.put({ bar: "D", baz: "d" }, 10);
-
- var req = index.count();
- req.onsuccess = function() {
- log("TestIndex1 count is: " + req.result);
- }
-
- startNextCursor();
-
- versionTransaction.onabort = function(event) {
- log("Initial upgrade versionchange transaction unexpected aborted");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- log("Initial upgrade versionchange transaction complete");
- done();
- }
-
- versionTransaction.onerror = function(event) {
- log("Initial upgrade versionchange transaction unexpected error" + event);
- done();
- }
-}
-
-</script>
</del><ins>+<script src="resources/index-cursor-2.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernindexcursor3expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/index-cursor-3-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/index-cursor-3-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/index-cursor-3-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,10 +1,11 @@
</span><span class="cx"> This tests that index cursors properly handle changing indexes.
</span><del>-Initial upgrade needed: Old version - 0 New version - 1
</del><span class="cx">
</span><del>-Starting a new cursor: testCursorDirection(index, 'next')
</del><ins>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</ins><span class="cx">
</span><del>-TestIndex1 count is: 18
</del><span class="cx">
</span><ins>+Initial upgrade needed: Old version - 0 New version - 1
+Starting a new cursor: testCursorDirection(index, 'next')
+TestIndex1 count is: 18
</ins><span class="cx"> Success opening or iterating cursor
</span><span class="cx"> Cursor direction is: next
</span><span class="cx"> Cursor source is: TestIndex1
</span><span class="lines">@@ -83,11 +84,8 @@
</span><span class="cx"> Cursor value is: [object Object]
</span><span class="cx"> Deleted key 18 from object store
</span><span class="cx"> Success opening or iterating cursor
</span><del>-
</del><span class="cx"> Starting a new cursor: testCursorDirection(index, 'prev')
</span><del>-
</del><span class="cx"> TestIndex1 count is: 18
</span><del>-
</del><span class="cx"> Success opening or iterating cursor
</span><span class="cx"> Cursor direction is: prev
</span><span class="cx"> Cursor source is: TestIndex1
</span><span class="lines">@@ -166,11 +164,8 @@
</span><span class="cx"> Cursor value is: [object Object]
</span><span class="cx"> Deleted key 1 from object store
</span><span class="cx"> Success opening or iterating cursor
</span><del>-
</del><span class="cx"> Starting a new cursor: testCursorDirection(index, 'nextunique')
</span><del>-
</del><span class="cx"> TestIndex1 count is: 18
</span><del>-
</del><span class="cx"> Success opening or iterating cursor
</span><span class="cx"> Cursor direction is: nextunique
</span><span class="cx"> Cursor source is: TestIndex1
</span><span class="lines">@@ -231,11 +226,8 @@
</span><span class="cx"> Deleted key 18 from object store
</span><span class="cx"> Deleted key 1 from object store
</span><span class="cx"> Success opening or iterating cursor
</span><del>-
</del><span class="cx"> Starting a new cursor: testCursorDirection(index, 'prevunique')
</span><del>-
</del><span class="cx"> TestIndex1 count is: 18
</span><del>-
</del><span class="cx"> Success opening or iterating cursor
</span><span class="cx"> Cursor direction is: prevunique
</span><span class="cx"> Cursor source is: TestIndex1
</span><span class="lines">@@ -279,5 +271,7 @@
</span><span class="cx"> Deleted key 2 from object store
</span><span class="cx"> Deleted key 1 from object store
</span><span class="cx"> Success opening or iterating cursor
</span><del>-Done
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernindexcursor3html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/index-cursor-3.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/index-cursor-3.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/index-cursor-3.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,177 +1,10 @@
</span><del>-This tests that index cursors properly handle changing indexes.<br>
-<div id="logger"></div>
-<script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
</ins><span class="cx">
</span><del>-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- log("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-function log(message)
-{
- document.getElementById("logger").innerHTML += message + "<br>";
-}
-
-var index;
-var objectStore;
-
-function logCursor(cursor)
-{
- log("Cursor direction is: " + cursor.direction);
- log("Cursor source is: " + cursor.source.name);
- log("Cursor key is: " + cursor.key);
- log("Cursor primary key is: " + cursor.primaryKey);
- log("Cursor value is: " + cursor.value);
-}
-
-function setupRequest(request)
-{
- request.onsuccess = function() {
- log("Success opening or iterating cursor");
- if (request.result)
- logCursor(request.result);
-
- if (request.result && request.iteratedOnce) {
- var primaryKey = request.result.primaryKey;
- if (primaryKey) {
- objectStore.delete(primaryKey).onsuccess = function() {
- log("Deleted key " + primaryKey + " from object store");
- }
- var nextPrimaryKey = primaryKey;
- if (request.result.direction.startsWith("next")) {
- nextPrimaryKey++;
- if (nextPrimaryKey > 18)
- nextPrimaryKey = 0;
- } else
- nextPrimaryKey--;
-
- if (nextPrimaryKey > 0) {
- objectStore.delete(nextPrimaryKey).onsuccess = function() {
- log("Deleted key " + nextPrimaryKey + " from object store");
- }
- }
-
- // Delete an additional item for unique cursors to make sure they iterate deeper into the sets
- // of primary keys and/or skip some index keys altogether.
- if (request.result.direction.endsWith("unique")) {
- var nextNextPrimaryKey = nextPrimaryKey;
- if (request.result.direction.startsWith("next")) {
- nextNextPrimaryKey++;
- if (nextNextPrimaryKey > 18)
- nextNextPrimaryKey = 0;
- } else
- nextNextPrimaryKey--;
-
- if (nextNextPrimaryKey > 0) {
- objectStore.delete(nextNextPrimaryKey).onsuccess = function() {
- log("Deleted key " + nextNextPrimaryKey + " from object store");
- }
- }
- }
- }
- }
-
- request.iteratedOnce = true;
-
- if (request.result)
- request.result.continue();
- else
- startNextCursor();
- }
- request.onerror = function(e) {
- log("Unexpected error opening or iterating cursor");
- logCursor(request.result);
- done();
- }
-}
-
-function testCursorDirection(index, direction)
-{
- var range = IDBKeyRange.lowerBound(-Infinity);
- var request = index.openCursor(range, direction);
- setupRequest(request);
-}
-
-var cursorCommands = [
- "testCursorDirection(index, 'prevunique')",
- "testCursorDirection(index, 'nextunique')",
- "testCursorDirection(index, 'prev')",
- "testCursorDirection(index, 'next')",
-];
-
-function startNextCursor()
-{
- if (!cursorCommands.length) {
- done();
- return;
- }
-
- populateObjectStore();
-
- var command = cursorCommands.pop();
- log("<br>Starting a new cursor: " + command);
- var req = index.count();
- req.onsuccess = function() {
- log("<br>TestIndex1 count is: " + req.result + "<br>");
- }
-
- eval(command);
-}
-
-function populateObjectStore()
-{
- objectStore.put({ bar: "A" }, 1);
- objectStore.put({ bar: "A" }, 2);
- objectStore.put({ bar: "B" }, 3);
- objectStore.put({ bar: "B" }, 4);
- objectStore.put({ bar: "C" }, 5);
- objectStore.put({ bar: "C" }, 6);
- objectStore.put({ bar: "D" }, 7);
- objectStore.put({ bar: "D" }, 8);
- objectStore.put({ bar: "E" }, 9);
- objectStore.put({ bar: "E" }, 10);
- objectStore.put({ bar: "F" }, 11);
- objectStore.put({ bar: "F" }, 12);
- objectStore.put({ bar: "G" }, 13);
- objectStore.put({ bar: "G" }, 14);
- objectStore.put({ bar: "H" }, 15);
- objectStore.put({ bar: "H" }, 16);
- objectStore.put({ bar: "I" }, 17);
- objectStore.put({ bar: "I" }, 18);
-}
-
-var createRequest = window.indexedDB.open("IndexCursor3Database", 1);
-createRequest.onupgradeneeded = function(event) {
- log("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- var database = event.target.result;
- objectStore = database.createObjectStore("TestObjectStore");
- index = objectStore.createIndex("TestIndex1", "bar");
-
- startNextCursor();
-
- versionTransaction.onabort = function(event) {
- log("Initial upgrade versionchange transaction unexpected aborted");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- log("Initial upgrade versionchange transaction complete");
- done();
- }
-
- versionTransaction.onerror = function(event) {
- log("Initial upgrade versionchange transaction unexpected error" + event);
- done();
- }
-}
-
-</script>
</del><ins>+<script src="resources/index-cursor-3.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernindexgetcountbasicexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/index-get-count-basic-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/index-get-count-basic-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/index-get-count-basic-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,4 +1,8 @@
</span><span class="cx"> This tests the most basic operation of the IDBIndex methods get(), getKey(), and count().
</span><ins>+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> get result is: [object Object]
</span><span class="cx"> bar is good
</span><span class="lines">@@ -6,5 +10,7 @@
</span><span class="cx"> getKey result is: foo
</span><span class="cx"> count result is: 1
</span><span class="cx"> Initial upgrade versionchange transaction complete
</span><del>-Done
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernindexgetcountbasichtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/index-get-count-basic.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/index-get-count-basic.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/index-get-count-basic.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,67 +1,10 @@
</span><del>-This tests the most basic operation of the IDBIndex methods get(), getKey(), and count().<br>
-<div id="logger"></div>
-<script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
</ins><span class="cx">
</span><del>-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- log("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-function log(message)
-{
- document.getElementById("logger").innerHTML += message + "<br>";
-}
-
-var createRequest = window.indexedDB.open("IndexGetCountBasicDatabase", 1);
-
-createRequest.onupgradeneeded = function(event) {
- log("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- var database = event.target.result;
- var objectStore = database.createObjectStore("TestObjectStore");
- var index = objectStore.createIndex("TestIndex", "bar");
-
- objectStore.put({ bar: "good", baz: "bad" }, "foo");
-
- var request1 = index.get("good");
- request1.onsuccess = function() {
- log("get result is: " + request1.result);
- for (n in request1.result)
- log(n + " is " + request1.result[n]);
- }
-
- request2 = index.getKey("good");
- request2.onsuccess = function() {
- log("getKey result is: " + request2.result);
- }
-
- var request3 = index.count();
- request3.onsuccess = function() {
- log("count result is: " + request3.result);
- }
-
- versionTransaction.onabort = function(event) {
- log("Initial upgrade versionchange transaction unexpected aborted");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- log("Initial upgrade versionchange transaction complete");
- done();
- }
-
- versionTransaction.onerror = function(event) {
- log("Initial upgrade versionchange transaction unexpected error" + event);
- done();
- }
-}
-
-</script>
</del><ins>+<script src="resources/index-get-count-basic.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernindexgetcountfailuresexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/index-get-count-failures-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/index-get-count-failures-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/index-get-count-failures-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,4 +1,8 @@
</span><span class="cx"> This tests some obvious failures that can happen while calling the IDBIndex methods get(), getKey(), and count().
</span><ins>+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> Failed to get with a null key
</span><span class="cx"> Failed to getKey with a null key
</span><span class="lines">@@ -14,5 +18,7 @@
</span><span class="cx"> Failed to getKey while transaction inactive
</span><span class="cx"> Failed to count while transaction inactive
</span><span class="cx"> readonly transaction complete
</span><del>-Done
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernindexgetcountfailureshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/index-get-count-failures.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/index-get-count-failures.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/index-get-count-failures.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,171 +1,10 @@
</span><del>-This tests some obvious failures that can happen while calling the IDBIndex methods get(), getKey(), and count().<br>
-<div id="logger"></div>
-<script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
</ins><span class="cx">
</span><del>-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- log("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-function log(message)
-{
- document.getElementById("logger").innerHTML += message + "<br>";
-}
-
-var createRequest = window.indexedDB.open("IndexGetCountFailuresDatabase", 1);
-var database;
-var index;
-
-createRequest.onupgradeneeded = function(event) {
- log("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- database = event.target.result;
- var objectStore = database.createObjectStore("TestObjectStore");
- index = objectStore.createIndex("TestIndex", "foo");
-
- try {
- index.get(null);
- } catch(e) {
- log("Failed to get with a null key");
- }
-
- try {
- index.getKey(null);
- } catch(e) {
- log("Failed to getKey with a null key");
- }
-
- try {
- index.count(null);
- } catch(e) {
- log("Failed to count with a null range");
- }
-
- objectStore.deleteIndex("TestIndex");
-
- try {
- index.get("test");
- } catch(e) {
- log("Failed to get with deleted IDBIndex");
- }
-
- try {
- index.getKey("test");
- } catch(e) {
- log("Failed to getKey with deleted IDBIndex");
- }
-
- try {
- index.count();
- } catch(e) {
- log("Failed to count with deleted IDBIndex");
- }
-
- try {
- objectStore.deleteIndex("TestIndex");
- } catch(e) {
- log("Failed to delete a nonexistent IDBIndex");
- }
-
- database.deleteObjectStore("TestObjectStore");
- try {
- index.get(null);
- } catch(e) {
- log("Failed to get with deleted IDBObjectStore");
- }
-
- try {
- index.getKey(null);
- } catch(e) {
- log("Failed to getKey with deleted IDBObjectStore");
- }
-
- try {
- index.count(null);
- } catch(e) {
- log("Failed to count with deleted IDBObjectStore");
- }
-
- var objectStore = database.createObjectStore("TestObjectStore2");
- objectStore.createIndex("TestIndex", "foo");
-
- versionTransaction.onabort = function(event) {
- log("Initial upgrade versionchange transaction unexpected aborted");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- log("Initial upgrade versionchange transaction complete");
- continueTest1();
- }
-
- versionTransaction.onerror = function(event) {
- log("Initial upgrade versionchange transaction unexpected error" + event);
- done();
- }
-}
-
-function continueTest1()
-{
- var transaction = database.transaction("TestObjectStore2", "readonly");
- var objectStore = transaction.objectStore("TestObjectStore2");
- index = objectStore.index("TestIndex");
-
- // Spin the transaction with get requests to keep it alive long enough for the setTimeout to fire.
- var canFinish = false;
- var spinGet = function() {
- objectStore.get("foo").onsuccess = function() {
- if (!canFinish)
- spinGet();
- }
- }
- spinGet();
-
- var testWhileInactive = function() {
- try {
- index.get(null);
- } catch(e) {
- log("Failed to get while transaction inactive");
- }
-
- try {
- index.getKey(null);
- } catch(e) {
- log("Failed to getKey while transaction inactive");
- }
-
- try {
- index.count(null);
- } catch(e) {
- log("Failed to count while transaction inactive");
- }
- canFinish = true;
- }
-
- setTimeout(testWhileInactive, 0);
-
- transaction.onabort = function(event) {
- log("readonly transaction unexpected abort" + event);
- done();
- }
-
- transaction.oncomplete = function(event) {
- log("readonly transaction complete");
- done();
- }
-
- transaction.onerror = function(event) {
- log("readonly transaction unexpected error" + event);
- done();
- }
-}
-
-</script>
</del><ins>+<script src="resources/index-get-count-failures.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernkeypathbasicexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/keypath-basic-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/keypath-basic-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/keypath-basic-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,3 +1,8 @@
</span><ins>+This test creates some object stores with keypaths. It then puts some values in them. It makes sure the keys used are as expected.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> ALERT: Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> ALERT: object put SUCCESS - foo1
</span><span class="cx"> ALERT: array put SUCCESS - foo2
</span><span class="lines">@@ -4,8 +9,7 @@
</span><span class="cx"> ALERT: Second object put SUCCESS - baz1
</span><span class="cx"> ALERT: Second array put SUCCESS - baz2
</span><span class="cx"> ALERT: Initial upgrade versionchange transaction complete
</span><del>-ALERT: Done
-This test creates some object stores with keypaths.
-It then puts some values in them.
-It makes sure the keys used are as expected.
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernkeypathbasichtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/keypath-basic.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/keypath-basic.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/keypath-basic.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,74 +1,9 @@
</span><del>-This test creates some object stores with keypaths.<br>
-It then puts some values in them.<br>
-It makes sure the keys used are as expected.<br>
-<script>
-
-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- alert("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-var createRequest = window.indexedDB.open("KeypathBasicTestDatabase", 1);
-
-createRequest.onupgradeneeded = function(event) {
- alert("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- var database = event.target.result;
- var objectStore1 = database.createObjectStore("OS1", { keyPath: "foo" });
- var objectStore2 = database.createObjectStore("OS2", { keyPath: "foo.bar" });
-
- var object = new Object;
- object.stuff = "bar1";
- object.foo = "foo1";
-
- var request1 = objectStore1.put(object);
- request1.onsuccess = function(event) {
- alert("object put SUCCESS - " + request1.result);
- }
-
- var array = { foo: "foo2", stuff: "bar2" };
-
- var request2 = objectStore1.put(array);
- request2.onsuccess = function(event) {
- alert("array put SUCCESS - " + request2.result);
- }
-
- object.foo = new Object;
- object.foo.bar = "baz1";
- var request3 = objectStore2.put(object);
- request3.onsuccess = function(event) {
- alert("Second object put SUCCESS - " + request3.result);
- }
-
- array.foo = { bar: "baz2" };
-
- var request4 = objectStore2.put(array);
- request4.onsuccess = function(event) {
- alert("Second array put SUCCESS - " + request4.result);
- }
-
- versionTransaction.onabort = function(event) {
- alert("Initial upgrade versionchange transaction unexpected aborted");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- alert("Initial upgrade versionchange transaction complete");
- done();
- }
-
- versionTransaction.onerror = function(event) {
- alert("Initial upgrade versionchange transaction unexpected error" + event);
- done();
- }
-}
-
-</script>
</del><span class="cx">\ No newline at end of file
</span><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
+<script src="resources/keypath-basic.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernobjectstoreattributesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/objectstore-attributes-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/objectstore-attributes-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/objectstore-attributes-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,4 +1,8 @@
</span><span class="cx"> This test exercises the readonly attributes on an IDBObjectStore.
</span><ins>+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> First upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> [object IDBTransaction] - versionchange
</span><span class="cx"> [object IDBDatabase]
</span><span class="lines">@@ -26,5 +30,7 @@
</span><span class="cx"> Baz index
</span><span class="cx"> Foo index
</span><span class="cx"> readonly transaction complete
</span><del>-Done
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernobjectstoreattributeshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/objectstore-attributes.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/objectstore-attributes.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/objectstore-attributes.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,107 +1,10 @@
</span><del>-This test exercises the readonly attributes on an IDBObjectStore.<br>
-<div id="logger"></div>
-<script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
</ins><span class="cx">
</span><del>-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-var request = window.indexedDB.open("ObjectStoreAttributesTestDatabase");
-
-function log(message)
-{
- document.getElementById("logger").innerHTML += message + "<br>";
-}
-
-function done()
-{
- log("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-var database;
-
-request.onupgradeneeded = function(event)
-{
- log("First upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var tx = request.transaction;
- database = event.target.result;
-
- log(tx + " - " + tx.mode);
- log(database);
-
- var os1 = database.createObjectStore('TestObjectStore1', { autoIncrement: true , keyPath: "foo" });
- var os2 = database.createObjectStore('TestObjectStore2', { autoIncrement: false });
-
- log(os1.name);
- log(os2.name);
- log(os1.autoIncrement);
- log(os2.autoIncrement);
- log(os1.keyPath);
- log(os2.keyPath);
- log(os1.transaction);
- log(os2.transaction);
- log(os1.transaction == tx);
- log(os2.transaction == tx);
- log(os1.transaction == os2.transaction);
-
- os2.createIndex("Foo index", "foo");
- os2.createIndex("Bar index", "bar");
-
- var names = os2.indexNames;
- log("Object store has indexes:")
- for (var i = 0; i < names.length; ++i)
- log(names[i]);
-
- os2.createIndex("Baz index", "baz");
- log("After adding another, object store now has indexes:");
- names = os2.indexNames;
- for (var i = 0; i < names.length; ++i)
- log(names[i]);
-
- tx.onabort = function(event) {
- log("First version change transaction unexpected abort");
- done();
- }
-
- tx.oncomplete = function(event) {
- log("First version change transaction completed");
- continueTest();
- }
-
- tx.onerror = function(event) {
- log("First version change transaction unexpected error - " + event);
- done();
- }
-}
-
-function continueTest()
-{
- var transaction = database.transaction("TestObjectStore2", "readonly");
- var objectStore = transaction.objectStore("TestObjectStore2");
-
- log("In a new transaction, object store has indexes:");
- var names = objectStore.indexNames;
- for (var i = 0; i < names.length; ++i)
- log(names[i]);
-
- transaction.onabort = function(event) {
- log("readonly transaction unexpected abort" + event);
- done();
- }
-
- transaction.oncomplete = function(event) {
- log("readonly transaction complete");
- done();
- }
-
- transaction.onerror = function(event) {
- log("readonly transaction unexpected error" + event);
- done();
- }
-}
-
-</script>
</del><ins>+<script src="resources/objectstore-attributes.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernobjectstorecursoradvancefailuresexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/objectstore-cursor-advance-failures-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/objectstore-cursor-advance-failures-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/objectstore-cursor-advance-failures-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,4 +1,8 @@
</span><span class="cx"> This tests some obvious failures that can happen while calling IDBCursor.advance() on object store cursors.
</span><ins>+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> Failed to advance object store cursor with undefined count argument
</span><span class="cx"> Failed to advance object store cursor with '0' count argument
</span><span class="lines">@@ -8,5 +12,7 @@
</span><span class="cx"> Initial upgrade versionchange transaction complete
</span><span class="cx"> Failed to advance object store cursor while transaction inactive
</span><span class="cx"> readonly transaction complete
</span><del>-Done
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernobjectstorecursoradvancefailureshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/objectstore-cursor-advance-failures.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/objectstore-cursor-advance-failures.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/objectstore-cursor-advance-failures.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,144 +1,10 @@
</span><del>-This tests some obvious failures that can happen while calling IDBCursor.advance() on object store cursors.<br>
-<div id="logger"></div>
-<script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
</ins><span class="cx">
</span><del>-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- log("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-function log(message)
-{
- document.getElementById("logger").innerHTML += message + "<br>";
-}
-
-var createRequest = window.indexedDB.open("IDBAdvanceFailuresDatabase", 1);
-var database;
-
-createRequest.onupgradeneeded = function(event) {
- log("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- database = event.target.result;
- var objectStore = database.createObjectStore("TestObjectStore");
- for (var i = 0; i < 10; ++i)
- objectStore.put("Record " + i, i);
-
- var request = objectStore.openCursor();
- request.onsuccess = function() {
- var cursor = request.result;
-
- try {
- cursor.advance();
- } catch(e) {
- log("Failed to advance object store cursor with undefined count argument");
- }
-
- try {
- cursor.advance(0);
- } catch(e) {
- log("Failed to advance object store cursor with '0' count argument");
- }
-
- try {
- cursor.advance(-1);
- } catch(e) {
- log("Failed to advance object store cursor with negative count argument");
- }
-
- database.deleteObjectStore("TestObjectStore");
- try {
- cursor.advance(1);
- } catch(e) {
- log("Failed to advance object store cursor after deleting object store");
- }
-
- // Recreate the object store for use in the next stage of testing
- objectStore = database.createObjectStore("TestObjectStore");
- for (var i = 0; i < 10; ++i)
- objectStore.put("Record " + i, i);
- }
-
- var os2 = database.createObjectStore("TestObjectStore2");
- for (var i = 0; i < 10; ++i)
- os2.put("Record " + i, i);
-
- var request2 = os2.openCursor();
- request2.onsuccess = function() {
- var cursor = request2.result;
- cursor.continue();
- try {
- cursor.advance(1);
- } catch(e) {
- log("Failed to advance an object store cursor when it is already fetching the next record");
- }
- request2.onsuccess = undefined;
- }
-
- versionTransaction.onabort = function(event) {
- log("Initial upgrade versionchange transaction unexpected aborted");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- log("Initial upgrade versionchange transaction complete");
- continueTest1();
- }
-
- versionTransaction.onerror = function(event) {
- log("Initial upgrade versionchange transaction unexpected error" + event);
- done();
- }
-}
-
-function continueTest1()
-{
- var transaction = database.transaction("TestObjectStore", "readonly");
- var objectStore = transaction.objectStore("TestObjectStore");
- var cursor = objectStore.openCursor();
-
- // Spin the transaction with get requests to keep it alive long enough for the setTimeout to fire.
- var canFinish = false;
- var spinGet = function() {
- objectStore.get("foo").onsuccess = function() {
- if (!canFinish)
- spinGet();
- }
- }
- spinGet();
-
- var testWhileInactive = function() {
- try {
- cursor.advance(1);
- } catch(e) {
- log("Failed to advance object store cursor while transaction inactive");
- }
- canFinish = true;
- }
-
- setTimeout(testWhileInactive, 0);
-
- transaction.onabort = function(event) {
- log("readonly transaction unexpected abort" + event);
- done();
- }
-
- transaction.oncomplete = function(event) {
- log("readonly transaction complete");
- done();
- }
-
- transaction.onerror = function(event) {
- log("readonly transaction unexpected error" + event);
- done();
- }
-}
-
-</script>
</del><ins>+<script src="resources/objectstore-cursor-advance-failures.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernobjectstorecursorcontinuefailuresexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/objectstore-cursor-continue-failures-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/objectstore-cursor-continue-failures-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/objectstore-cursor-continue-failures-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,4 +1,8 @@
</span><span class="cx"> This tests some obvious failures that can happen while calling IDBCursor.continue() on object store cursors.
</span><ins>+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> Failed to continue a 'next' object store cursor to a key less than the current key
</span><span class="cx"> Failed to continue object store cursor with invalid key
</span><span class="lines">@@ -8,5 +12,7 @@
</span><span class="cx"> Initial upgrade versionchange transaction complete
</span><span class="cx"> Failed to continue object store cursor while transaction inactive
</span><span class="cx"> readonly transaction complete
</span><del>-Done
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernobjectstorecursorcontinuefailureshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/objectstore-cursor-continue-failures.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/objectstore-cursor-continue-failures.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/objectstore-cursor-continue-failures.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,148 +1,10 @@
</span><del>-This tests some obvious failures that can happen while calling IDBCursor.continue() on object store cursors.<br>
-<div id="logger"></div>
-<script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
</ins><span class="cx">
</span><del>-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- log("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-function log(message)
-{
- document.getElementById("logger").innerHTML += message + "<br>";
-}
-
-var createRequest = window.indexedDB.open("IDBContinueFailuresDatabase", 1);
-var database;
-
-createRequest.onupgradeneeded = function(event) {
- log("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- database = event.target.result;
- var objectStore = database.createObjectStore("TestObjectStore");
- for (var i = 0; i < 10; ++i)
- objectStore.put("Record " + i, i);
-
- var request = objectStore.openCursor();
- request.onsuccess = function() {
- var cursor = request.result;
-
- try {
- cursor.continue(-1);
- } catch(e) {
- log("Failed to continue a 'next' object store cursor to a key less than the current key");
- }
-
- try {
- cursor.continue(NaN);
- } catch(e) {
- log("Failed to continue object store cursor with invalid key");
- }
-
- database.deleteObjectStore("TestObjectStore");
- try {
- cursor.continue();
- } catch(e) {
- log("Failed to continue object store cursor after deleting object store");
- }
-
- // Recreate the object store for use in the next stage of testing
- objectStore = database.createObjectStore("TestObjectStore");
- for (var i = 0; i < 10; ++i)
- objectStore.put("Record " + i, i);
- }
-
- var request2 = objectStore.openCursor(IDBKeyRange.lowerBound(-Infinity), "prev");
- request2.onsuccess = function() {
- var cursor = request2.result;
- try {
- cursor.continue(100);
- } catch(e) {
- log("Failed to continue a 'prev' object store cursor to a key greater than the current key");
- }
- }
-
- var os2 = database.createObjectStore("TestObjectStore2");
- for (var i = 0; i < 10; ++i)
- os2.put("Record " + i, i);
-
- var request3 = os2.openCursor();
- request3.onsuccess = function() {
- var cursor = request3.result;
- cursor.continue();
- try {
- cursor.continue();
- } catch(e) {
- log("Failed to continue an object store cursor when it is already fetching the next record");
- }
- request3.onsuccess = undefined;
- }
-
- versionTransaction.onabort = function(event) {
- log("Initial upgrade versionchange transaction unexpected aborted");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- log("Initial upgrade versionchange transaction complete");
- continueTest1();
- }
-
- versionTransaction.onerror = function(event) {
- log("Initial upgrade versionchange transaction unexpected error" + event);
- done();
- }
-}
-
-function continueTest1()
-{
- var transaction = database.transaction("TestObjectStore", "readonly");
- var objectStore = transaction.objectStore("TestObjectStore");
- var cursor = objectStore.openCursor();
-
- // Spin the transaction with get requests to keep it alive long enough for the setTimeout to fire.
- var canFinish = false;
- var spinGet = function() {
- objectStore.get("foo").onsuccess = function() {
- if (!canFinish)
- spinGet();
- }
- }
- spinGet();
-
- var testWhileInactive = function() {
- try {
- cursor.continue();
- } catch(e) {
- log("Failed to continue object store cursor while transaction inactive");
- }
- canFinish = true;
- }
-
- setTimeout(testWhileInactive, 0);
-
- transaction.onabort = function(event) {
- log("readonly transaction unexpected abort" + event);
- done();
- }
-
- transaction.oncomplete = function(event) {
- log("readonly transaction complete");
- done();
- }
-
- transaction.onerror = function(event) {
- log("readonly transaction unexpected error" + event);
- done();
- }
-}
-
-</script>
</del><ins>+<script src="resources/objectstore-cursor-continue-failures.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernopencursorfailuresexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/opencursor-failures-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/opencursor-failures-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/opencursor-failures-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,4 +1,8 @@
</span><span class="cx"> This tests some obvious failures that can happen while opening cursors.
</span><ins>+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> Failed to open object store cursor with invalid keypath
</span><span class="cx"> Failed to open object store cursor with invalid direction
</span><span class="lines">@@ -17,5 +21,7 @@
</span><span class="cx"> Failed to open index cursor from inactive transaction
</span><span class="cx"> Failed to open index key cursor from inactive transaction
</span><span class="cx"> readonly transaction complete
</span><del>-Done
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernopencursorfailureshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/opencursor-failures.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/opencursor-failures.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/opencursor-failures.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,188 +1,10 @@
</span><del>-This tests some obvious failures that can happen while opening cursors.<br>
-<div id="logger"></div>
-<script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
</ins><span class="cx">
</span><del>-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- log("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-function log(message)
-{
- document.getElementById("logger").innerHTML += message + "<br>";
-}
-
-var createRequest = window.indexedDB.open("OpenCursorFailuresDatabase", 1);
-var database;
-var objectStore;
-var index;
-
-createRequest.onupgradeneeded = function(event) {
- log("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- database = event.target.result;
- objectStore = database.createObjectStore("TestObjectStore");
- index = objectStore.createIndex("TestIndex", "bar");
- var request = objectStore.put({ bar: "bar" }, "foo");
-
- request.onsuccess = function() {
- try {
- objectStore.openCursor(NaN);
- } catch(e) {
- log("Failed to open object store cursor with invalid keypath");
- }
-
- try {
- objectStore.openCursor("foo", "invalid direction");
- } catch(e) {
- log("Failed to open object store cursor with invalid direction");
- }
-
- try {
- index.openCursor(NaN);
- } catch(e) {
- log("Failed to open index cursor with invalid keypath");
- }
-
- try {
- index.openCursor("foo", "invalid direction");
- } catch(e) {
- log("Failed to open index cursor with invalid direction");
- }
-
- try {
- index.openKeyCursor(NaN);
- } catch(e) {
- log("Failed to open index key cursor with invalid keypath");
- }
-
- try {
- index.openKeyCursor("foo", "invalid direction");
- } catch(e) {
- log("Failed to open index key cursor with invalid direction");
- }
-
- database.deleteObjectStore("TestObjectStore");
-
- try {
- objectStore.openCursor();
- } catch(e) {
- log("Failed to open object store cursor on deleted object store");
- }
-
- try {
- index.openCursor();
- } catch(e) {
- log("Failed to open index cursor on deleted object store");
- }
-
- try {
- index.openKeyCursor();
- } catch(e) {
- log("Failed to open index key cursor on deleted object store");
- }
-
- // Recreate the objectstore because we'll need it in phase 2.
- objectStore = database.createObjectStore("TestObjectStore");
- index = objectStore.createIndex("TestIndex", "bar");
- objectStore.put({ bar: "bar" }, "foo");
- }
-
- versionTransaction.onabort = function(event) {
- log("Initial upgrade versionchange transaction unexpected aborted");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- log("Initial upgrade versionchange transaction complete");
- continueTest1();
- }
-
- versionTransaction.onerror = function(event) {
- log("Initial upgrade versionchange transaction unexpected error" + event);
- done();
- }
-}
-
-function continueTest1()
-{
- try {
- objectStore.openCursor();
- } catch(e) {
- log("Failed to open object store cursor from completed transaction");
- }
-
- try {
- index.openCursor();
- } catch(e) {
- log("Failed to open index cursor from completed transaction");
- }
-
- try {
- index.openKeyCursor();
- } catch(e) {
- log("Failed to open index key cursor from completed transaction");
- }
-
- var transaction = database.transaction("TestObjectStore", "readonly");
- objectStore = transaction.objectStore("TestObjectStore");
- index = objectStore.index("TestIndex");
-
- // Spin the transaction with get requests to keep it alive long enough for the setTimeout to fire.
- var canFinish = false;
- var spinGet = function() {
- objectStore.get("foo").onsuccess = function() {
- if (!canFinish)
- spinGet();
- }
- }
- spinGet();
-
- var getWhileInactive = function() {
- try {
- objectStore.openCursor();
- } catch(e) {
- log("Failed to open object store cursor from inactive transaction");
- }
-
- try {
- index.openCursor();
- } catch(e) {
- log("Failed to open index cursor from inactive transaction");
- }
-
- try {
- index.openKeyCursor();
- } catch(e) {
- log("Failed to open index key cursor from inactive transaction");
- }
- canFinish = true;
- }
-
- setTimeout(getWhileInactive, 0);
-
- transaction.onabort = function(event) {
- log("readonly transaction unexpected abort" + event);
- done();
- }
-
- transaction.oncomplete = function(event) {
- log("readonly transaction complete");
- done();
- }
-
- transaction.onerror = function(event) {
- log("readonly transaction unexpected error" + event);
- done();
- }
-}
-
-</script>
</del><ins>+<script src="resources/opencursor-failures.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernopendatabaserequesteventexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/opendatabase-request-event-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/opendatabase-request-event-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/opendatabase-request-event-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,3 +1,8 @@
</span><ins>+This test calls open on window.indexedDB in various ways, verifying that IDBOpenDBRequest objects are returned when expected and exceptions are thrown when expected.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> ALERT: Caught exception TypeError: Type error
</span><span class="cx"> ALERT: Caught exception TypeError: Value -1 is outside the range [0, 9007199254740991]
</span><span class="cx"> ALERT: [object IDBOpenDBRequest]
</span><span class="lines">@@ -2,3 +7,5 @@
</span><span class="cx"> ALERT: upgradeneeded: old version - 0 new version - 1
</span><del>-ALERT: Done
-This test calls open on window.indexedDB in various ways, verifying that IDBOpenDBRequest objects are returned when expected and exceptions are thrown when expected.
</del><ins>+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernopendatabaserequesteventhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/opendatabase-request-event.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/opendatabase-request-event.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/opendatabase-request-event.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,47 +1,9 @@
</span><del>-This test calls open on window.indexedDB in various ways, verifying that IDBOpenDBRequest objects are returned when expected and exceptions are thrown when expected.
-<script>
-
-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- alert("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-try {
- window.indexedDB.open("TestDatabase", 0);
-} catch (e) {
- alert("Caught exception " + e);
-}
-
-try {
- window.indexedDB.open("TestDatabase", -1);
-} catch (e) {
- alert("Caught exception " + e);
-}
-
-var request = window.indexedDB.open("TestDatabase");
-alert(request);
-
-request.onsuccess = function()
-{
- alert("success");
- done();
-}
-request.onerror = function(e)
-{
- alert("error " + e);
- done();
-}
-
-request.onupgradeneeded = function(e)
-{
- alert("upgradeneeded: old version - " + e.oldVersion + " new version - " + e.newVersion);
- done();
-}
-</script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
+<script src="resources/opendatabase-request-event.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernopendatabaserequestexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/opendatabase-request-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/opendatabase-request-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/opendatabase-request-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,3 +1,8 @@
</span><ins>+This test calls open on window.indexedDB in various ways, verifying that IDBOpenDBRequest objects are returned when expected and exceptions are thrown when expected.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> ALERT: [object IDBOpenDBRequest]
</span><span class="cx"> ALERT: [object IDBOpenDBRequest]
</span><span class="cx"> ALERT: TypeError: Not enough arguments
</span><span class="lines">@@ -2,3 +7,5 @@
</span><span class="cx"> ALERT: TypeError: Type error
</span><del>-ALERT: Done
-This test calls open on window.indexedDB in various ways, verifying that IDBOpenDBRequest objects are returned when expected and exceptions are thrown when expected.
</del><ins>+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernopendatabaserequesthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/opendatabase-request.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/opendatabase-request.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/opendatabase-request.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,35 +1,9 @@
</span><del>-This test calls open on window.indexedDB in various ways, verifying that IDBOpenDBRequest objects are returned when expected and exceptions are thrown when expected.
-<script>
-
-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- alert("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-var request = window.indexedDB.open("TestDatabase");
-alert(request);
-
-request = window.indexedDB.open("");
-alert(request);
-
-try {
- var request = window.indexedDB.open();
-} catch (e) {
- alert(e);
-}
-
-try {
- var request = window.indexedDB.open("name", 0);
-} catch (e) {
- alert(e);
-}
-
-done();
-</script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
+<script src="resources/opendatabase-request.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernopendatabasesuccessafterversionchangeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/opendatabase-success-after-versionchange-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/opendatabase-success-after-versionchange-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/opendatabase-success-after-versionchange-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,10 +1,13 @@
</span><del>-This test verifies that:
-- Opening a new database results in the onupgradeneeded handler being called on the IDBOpenDBRequest.
-- The versionchange transaction representing the upgrade commits successfully.
-- After that transaction commits, the onsuccess handler on the original IDBOpenDBRequest is called.
</del><ins>+This test verifies that: - Opening a new database results in the onupgradeneeded handler being called on the IDBOpenDBRequest. - The versionchange transaction representing the upgrade commits successfully. - After that transaction commits, the onsuccess handler on the original IDBOpenDBRequest is called.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> upgradeneeded: old version - 0 new version - 1
</span><span class="cx"> [object IDBTransaction]
</span><span class="cx"> Version change complete
</span><span class="cx"> Got the onsuccess handler as expected.
</span><del>-Done
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernopendatabasesuccessafterversionchangehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/opendatabase-success-after-versionchange.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/opendatabase-success-after-versionchange.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/opendatabase-success-after-versionchange.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,61 +1,10 @@
</span><del>-This test verifies that:<br>
- - Opening a new database results in the onupgradeneeded handler being called on the IDBOpenDBRequest.<br>
- - The versionchange transaction representing the upgrade commits successfully.<br>
- - After that transaction commits, the onsuccess handler on the original IDBOpenDBRequest is called.<br>
-<div id="logger"></div>
-<script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
</ins><span class="cx">
</span><del>-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- log("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-function log(message)
-{
- document.getElementById("logger").innerHTML += message + "<br>";
-}
-
-var request = window.indexedDB.open("OpenDatabaseSuccessAfterVersionChangeDatabase");
-
-request.onsuccess = function()
-{
- log("Got the onsuccess handler as expected.");
- done();
-}
-request.onerror = function(e)
-{
- log("Unexpected onerror handler called");
- done();
-}
-
-request.onupgradeneeded = function(e)
-{
- log("upgradeneeded: old version - " + e.oldVersion + " new version - " + e.newVersion);
- log(request.transaction);
-
- request.transaction.oncomplete = function()
- {
- log("Version change complete");
- }
-
- request.transaction.onabort = function()
- {
- log("Version change unexpected abort");
- done();
- }
-
- request.transaction.onerror = function()
- {
- log("Version change unexpected error");
- done();
- }
-}
-
-</script>
</del><ins>+<script src="resources/opendatabase-success-after-versionchange.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernopendatabaseversionsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/opendatabase-versions-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/opendatabase-versions-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/opendatabase-versions-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,4 +1,8 @@
</span><span class="cx"> This test creates a new database with the default version, commits that versionchange transaction, and then reopens it at different versions to make sure the IDBOpenDBRequests behave appropriately.
</span><ins>+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> [object IDBOpenDBRequest] (firstPhase)
</span><span class="cx"> upgradeneeded (firstPhase): old version - 0 new version - 1
</span><span class="cx"> [object IDBTransaction]
</span><span class="lines">@@ -13,6 +17,7 @@
</span><span class="cx"> [object IDBOpenDBRequest] (fourthPhase)
</span><span class="cx"> Open request error (thirdPhase) AbortError
</span><span class="cx"> Expected error (fourthPhase) - VersionError
</span><del>-Done
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernopendatabaseversionshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/opendatabase-versions.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/opendatabase-versions.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/opendatabase-versions.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,140 +1,10 @@
</span><del>-This test creates a new database with the default version, commits that versionchange transaction, and then reopens it at different versions to make sure the IDBOpenDBRequests behave appropriately.<br>
-<div id="logger"></div><br>
-<script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
</ins><span class="cx">
</span><del>-function log(msg)
-{
- document.getElementById("logger").innerHTML += msg + "<br>";
-}
-
-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- log("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-var request = window.indexedDB.open("VersionTestDatabase");
-log(request + " (firstPhase)");
-
-request.onsuccess = function()
-{
- log("First version change successful");
-}
-request.onerror = function(e)
-{
- log("Open request error (firstPhase) " + request.error.name);
-}
-
-request.onupgradeneeded = function(e)
-{
- var database = event.target.result;
-
- log("upgradeneeded (firstPhase): old version - " + e.oldVersion + " new version - " + e.newVersion);
- log(request.transaction);
- request.transaction.oncomplete = function()
- {
- log("Version change complete (firstPhase). Database version is now - " + database.version);
- database.close();
- secondPhase();
- }
- request.transaction.onabort = function()
- {
- log("Version change transaction unexpected abort! (firstPhase)");
- done();
- }
- request.transaction.onerror = function()
- {
- log("Version change transaction unexpected error! (firstPhase)");
- done();
- }
-}
-
-function secondPhase()
-{
- var request = window.indexedDB.open("VersionTestDatabase", 1);
- log(request + " (secondPhase)");
- request.onsuccess = function()
- {
- log("Successfully opened database at version 1 (secondPhase)");
- request.result.close();
- request.result.close(); // Close it twice just for the heck of it
- thirdPhase();
- }
- request.onerror = function(e)
- {
- log("Unexpected error (secondPhase)" + e);
- done();
- }
- request.onupgradeneeded = function(e)
- {
- log("Unexpected upgrade needed (secondPhase)" + e);
- done();
- }
-}
-
-function thirdPhase()
-{
- var request = window.indexedDB.open("VersionTestDatabase", 2);
- log(request + " (thirdPhase)");
- request.onsuccess = function()
- {
- log("Version change to version 2 successful");
- }
- request.onerror = function(e)
- {
- log("Open request error (thirdPhase) " + request.error.name);
- }
- request.onupgradeneeded = function(e)
- {
- var database = event.target.result;
-
- log("upgradeneeded (thirdPhase): old version - " + e.oldVersion + " new version - " + e.newVersion);
- log(request.transaction);
- request.transaction.oncomplete = function()
- {
- log("Version change complete (thirdPhase). Database version is now - " + database.version);
- database.close();
- fourthPhase();
- }
- request.transaction.onabort = function()
- {
- log("Version change transaction unexpected abort! (thirdPhase)");
- done();
- }
- request.transaction.onerror = function()
- {
- log("Version change transaction unexpected error! (thirdPhase)");
- done();
- }
- }
-}
-
-function fourthPhase()
-{
- // We've upgraded to version 2, so version 1 should not be openable.
- var request = window.indexedDB.open("VersionTestDatabase", 1);
- log(request + " (fourthPhase)");
- request.onsuccess = function()
- {
- log("Unexpected success (fourthPhase)");
- done();
- }
- request.onerror = function(e)
- {
- log("Expected error (fourthPhase) - " + request.error.name);
- done();
- }
- request.onupgradeneeded = function(e)
- {
- log("Unexpected upgradeneeded (fourthPhase)");
- done();
- }
-}
-
-</script>
</del><ins>+<script src="resources/opendatabase-versions.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernrequestreadystateexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/request-readystate-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/request-readystate-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/request-readystate-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,4 +1,8 @@
</span><span class="cx"> This test makes sure that IDBRequest.readyState returns expected values.
</span><ins>+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> After calling indexedDB.open(), create request readyState is: pending
</span><span class="cx"> Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> Create request readyState is: done
</span><span class="lines">@@ -7,5 +11,7 @@
</span><span class="cx"> After calling continue(), request readyState is: pending
</span><span class="cx"> After continue() completed, request readyState is: done
</span><span class="cx"> Initial upgrade versionchange transaction complete
</span><del>-Done
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernrequestreadystatehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/request-readystate.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/request-readystate.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/request-readystate.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,65 +1,10 @@
</span><del>-This test makes sure that IDBRequest.readyState returns expected values.<br>
-<div id="logger"></div>
-<script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
</ins><span class="cx">
</span><del>-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- log("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-function log(message)
-{
- document.getElementById("logger").innerHTML += message + "<br>";
-}
-
-var createRequest = window.indexedDB.open("RequestReadyStateDatabase", 1);
-log("After calling indexedDB.open(), create request readyState is: " + createRequest.readyState);
-
-createRequest.onupgradeneeded = function(event) {
- log("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
- log("Create request readyState is: " + createRequest.readyState);
-
- var versionTransaction = createRequest.transaction;
- var database = event.target.result;
- var objectStore = database.createObjectStore("TestObjectStore");
-
- for (var i = 0; i < 2; ++i)
- objectStore.put("Record " + i, i);
-
- var request = objectStore.openCursor();
- log("After calling openCursor, request readyState is: " + request.readyState);
- request.onsuccess = function() {
- log("After successful opening of the cursor, request readyState is: " + request.readyState);
-
- request.onsuccess = function() {
- log("After continue() completed, request readyState is: " + request.readyState);
- }
-
- request.result.continue();
- log("After calling continue(), request readyState is: " + request.readyState);
- }
-
- versionTransaction.onabort = function(event) {
- log("Initial upgrade versionchange transaction unexpected aborted");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- log("Initial upgrade versionchange transaction complete");
- done();
- }
-
- versionTransaction.onerror = function(event) {
- log("Initial upgrade versionchange transaction unexpected error" + event);
- done();
- }
-}
-
-</script>
</del><ins>+<script src="resources/request-readystate.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesabortrequestscancelledjsfromrev195319trunkLayoutTestsstorageindexeddbmodernabortrequestscancelledhtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/abort-requests-cancelled.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/abort-requests-cancelled.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/abort-requests-cancelled.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/abort-requests-cancelled.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,151 @@
</span><ins>+description("This test makes sure that un-handled requests in a transaction receive onerror callbacks when the transaction is aborted.");
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+function log(message)
+{
+ debug(message);
+}
+
+var database;
+var objectStore;
+
+function setupRequest(code)
+{
+ var request = eval(code);
+ request.onsuccess = function()
+ {
+ log ("Success handling: \"" + code + "\"");
+ }
+ request.onerror = function(e)
+ {
+ log ("Error handling: \"" + code + "\" (" + e.type + ")");
+ e.stopPropagation();
+ }
+}
+
+startTest();
+
+function startTest() {
+ var createRequest = window.indexedDB.open("AbortRequestsCancelledDatabase", 1);
+ createRequest.onupgradeneeded = function(event) {
+ debug("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ var database = event.target.result;
+ objectStore = database.createObjectStore("TestObjectStore");
+ setupRequest("objectStore.put({ bar: 'A' }, 1);");
+ setupRequest("objectStore.put({ bar: 'B' }, 2);");
+ setupRequest("objectStore.put({ bar: 'C' }, 3);");
+
+ versionTransaction.abort();
+
+ versionTransaction.onabort = function(event) {
+ debug("Initial upgrade versionchange transaction aborted");
+ database.close();
+ continueTest1();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected complete");
+ done();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("Initial upgrade versionchange transaction error " + event);
+ }
+ }
+}
+
+function continueTest1() {
+ var createRequest = window.indexedDB.open("AbortRequestsCancelledDatabase", 1);
+ createRequest.onupgradeneeded = function(event) {
+ debug("Second upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ database = event.target.result;
+ objectStore = database.createObjectStore("TestObjectStore");
+
+ setupRequest("objectStore.put({ bar: 'A' }, 1);");
+ setupRequest("objectStore.put({ bar: 'B' }, 2);");
+ setupRequest("objectStore.put({ bar: 'C' }, 3);");
+
+ versionTransaction.onabort = function(event) {
+ debug("Second upgrade versionchange transaction unexpected abort");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("Second upgrade versionchange transaction completed");
+ continueTest2();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("Second upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+ }
+}
+
+function continueTest2() {
+ var transaction = database.transaction("TestObjectStore", "readwrite");
+ objectStore = transaction.objectStore("TestObjectStore");
+
+ setupRequest("objectStore.get(1);");
+ setupRequest("objectStore.get(2);");
+ setupRequest("objectStore.get(3);");
+ setupRequest("objectStore.put({ bar: 'D' }, 4);");
+ setupRequest("objectStore.put({ bar: 'E' }, 5);");
+ setupRequest("objectStore.put({ bar: 'F' }, 6);");
+
+ transaction.abort();
+
+ transaction.onabort = function(event) {
+ debug("readwrite transaction aborted");
+ continueTest3();
+ }
+
+ transaction.oncomplete = function(event) {
+ debug("readwrite transaction unexpected complete");
+ done();
+ }
+
+ transaction.onerror = function(event) {
+ debug("readwrite transaction unexpected error" + event);
+ done();
+ }
+}
+
+function continueTest3() {
+ var transaction = database.transaction("TestObjectStore", "readonly");
+ objectStore = transaction.objectStore("TestObjectStore");
+
+ setupRequest("objectStore.get(1);");
+ setupRequest("objectStore.get(2);");
+ setupRequest("objectStore.get(3);");
+
+ transaction.abort();
+
+ transaction.onabort = function(event) {
+ debug("readonly transaction aborted");
+ done();
+ }
+
+ transaction.oncomplete = function(event) {
+ debug("readwrite transaction unexpected complete");
+ done();
+ }
+
+ transaction.onerror = function(event) {
+ debug("readwrite transaction unexpected error" + event);
+ done();
+ }
+}
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesabortedputjsfromrev195319trunkLayoutTestsstorageindexeddbmodernabortedputhtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/aborted-put.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/aborted-put.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/aborted-put.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/aborted-put.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,198 @@
</span><ins>+description("This test creates some object stores, putting some values in them, committing the transaction. \
+In a new transaction, it then overwrites those values, but then aborts the transaction. \
+Finally it verifies everything is set up from the first transaction, and nothing from the aborted one committed.");
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+var request = window.indexedDB.open("AbortedPutTestDatabase");
+
+function done()
+{
+ finishJSTest();
+}
+
+request.onupgradeneeded = function(event)
+{
+ debug("ALERT: " + "First upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var tx = request.transaction;
+ var db = event.target.result;
+
+ debug("ALERT: " + tx + " - " + tx.mode);
+ debug("ALERT: " + db);
+
+ var os1 = db.createObjectStore("TestObjectStore1");
+ var os2 = db.createObjectStore("TestObjectStore2");
+
+ var putRequest = os1.put("bar", "foo");
+
+ putRequest.onsuccess = function(event) {
+ debug("ALERT: " + "put succeeded - key was '" + putRequest.result + "'");
+
+ var getRequest1 = os1.get("foo");
+ getRequest1.onsuccess = function(event) {
+ debug("ALERT: " + "get 'foo' succeeded - value was '" + getRequest1.result + "'");
+ }
+
+ getRequest1.onerror = function(event) {
+ debug("ALERT: " + "get 'foo' unexpectedly failed - " + event);
+ done();
+ }
+
+ var getRequest2 = os2.get("far");
+ getRequest2.onsuccess = function(event) {
+ debug("ALERT: " + "get 'far' succeeded - value was '" + getRequest2.result + "'");
+ }
+
+ getRequest2.onerror = function(event) {
+ debug("ALERT: " + "get 'far' unexpectedly failed - " + event);
+ done();
+ }
+ }
+
+ putRequest.onerror = function(event) {
+ debug("ALERT: " + "put unexpectedly failed - " + event);
+ done();
+ }
+
+ tx.onabort = function(event) {
+ debug("ALERT: " + "First version change transaction unexpected abort");
+ done();
+ }
+
+ tx.oncomplete = function(event) {
+ debug("ALERT: " + "First version change transaction completed");
+ db.close();
+ continueTest1();
+ }
+
+ tx.onerror = function(event) {
+ debug("ALERT: " + "First version change transaction unexpected error - " + event);
+ done();
+ }
+}
+
+function continueTest1()
+{
+ var request = window.indexedDB.open("AbortedPutTestDatabase", 2);
+
+ request.onupgradeneeded = function(event) {
+ debug("ALERT: " + "Second upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var tx = request.transaction;
+ var db = event.target.result;
+
+ debug("ALERT: " + tx + " - " + tx.mode);
+ debug("ALERT: " + db);
+
+ var os1 = tx.objectStore("TestObjectStore1");
+ var os2 = tx.objectStore("TestObjectStore2");
+ var putRequest1 = os1.put("baz", "foo");
+ var putRequest2 = os2.put("boo", "far");
+
+ putRequest1.onerror = function(e) {
+ debug("ALERT: " + "Unexpected error overwriting bar with baz - " + e);
+ done();
+ }
+
+ putRequest2.onerror = function(e) {
+ debug("ALERT: " + "Writing into second object store unexpectedly failed - " + e);
+ done();
+ }
+
+ putRequest2.onsuccess = function(e) {
+ var getRequest1 = os1.get("foo");
+ var getRequest2 = os2.get("far");
+
+ getRequest1.onsuccess = function(event) {
+ debug("ALERT: " + "get1 'foo' succeeded - value was '" + getRequest1.result + "'");
+ }
+
+ getRequest1.onerror = function(event) {
+ debug("ALERT: " + "get1 unexpectedly failed - " + event);
+ done();
+ }
+
+ getRequest2.onsuccess = function(event) {
+ debug("ALERT: " + "get2 'far' succeeded - value was '" + getRequest2.result + "'");
+ tx.abort();
+ }
+
+ getRequest2.onerror = function(event) {
+ debug("ALERT: " + "get2 unexpectedly failed - " + event);
+ done();
+ }
+ }
+
+ tx.onabort = function(event) {
+ debug("ALERT: " + "Second version change transaction abort");
+ db.close();
+ continueTest2();
+ }
+
+ tx.oncomplete = function(event) {
+ debug("ALERT: " + "Second version change transaction unexpected complete");
+ done();
+ }
+
+ tx.onerror = function(event) {
+ debug("ALERT: " + "Second version change transaction error - " + event);
+ }
+ }
+}
+
+function continueTest2()
+{
+ var request = window.indexedDB.open("AbortedPutTestDatabase", 2);
+
+ request.onupgradeneeded = function(event) {
+ debug("ALERT: " + "Third upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var tx = request.transaction;
+ var db = event.target.result;
+
+ debug("ALERT: " + tx + " - " + tx.mode);
+ debug("ALERT: " + db);
+
+ var os1 = tx.objectStore("TestObjectStore1");
+ var os2 = tx.objectStore("TestObjectStore2");
+ var getRequest1 = os1.get("foo");
+ var getRequest2 = os2.get("far");
+
+ getRequest1.onsuccess = function(event) {
+ debug("ALERT: " + "get1 'foo' succeeded - value was '" + getRequest1.result + "'");
+ }
+
+ getRequest1.onerror = function(event) {
+ debug("ALERT: " + "get1 'foo' unexpectedly failed - " + event);
+ done();
+ }
+
+ getRequest2.onsuccess = function(event) {
+ debug("ALERT: " + "get2 'far' succeeded - value was '" + getRequest2.result + "'");
+ }
+
+ getRequest2.onerror = function(event) {
+ debug("ALERT: " + "get2 'far' unexpectedly failed - " + event);
+ done();
+ }
+
+ tx.onabort = function(event) {
+ debug("ALERT: " + "Third version change transaction unexpected abort");
+ done();
+ }
+
+ tx.oncomplete = function(event) {
+ debug("ALERT: " + "Third version change transaction complete");
+ done();
+ }
+
+ tx.onerror = function(event) {
+ debug("ALERT: " + "Third version change transaction unexpected error - " + event);
+ done();
+ }
+ }
+}
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesautoincrementabortjsfromrev195319trunkLayoutTestsstorageindexeddbmodernautoincrementaborthtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/autoincrement-abort.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/autoincrement-abort.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/autoincrement-abort.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/autoincrement-abort.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,158 @@
</span><ins>+description("This test creates a new database with an objectstore that autoincrements. \
+It then puts some things in that object store, checking the keys that were used. \
+But it then aborts that transaction. \
+Then it opens a new one and puts something in it, double checking that the key generator was reverted when the above transaction was aborted.");
+
+
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+var createRequest = window.indexedDB.open("AutoincrementAbortDatabase", 1);
+var database;
+
+createRequest.onupgradeneeded = function(event) {
+ debug("ALERT: " + "Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ database = event.target.result;
+ var objectStore = database.createObjectStore('TestObjectStore', { autoIncrement: true });
+
+ versionTransaction.onabort = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction unexpected abort");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction complete");
+ continueTest1();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
+
+function putChecker(event) {
+ debug("ALERT: " + "Key used for put was " + event.target.result);
+}
+
+function continueTest1()
+{
+ debug("ALERT: " + "Opening readwrite transaction to bump the key generator, but it will be aborted");
+ var transaction = database.transaction('TestObjectStore', "readwrite");
+ var objectStore = transaction.objectStore('TestObjectStore');
+
+ var request = objectStore.put("bar1");
+ request.onsuccess = putChecker;
+ var request = objectStore.put("bar2");
+ request.onsuccess = putChecker;
+ var request = objectStore.put("bar3");
+ request.onsuccess = putChecker;
+ var request = objectStore.put("bar4");
+ request.onsuccess = putChecker;
+ var request = objectStore.put("bar5");
+ request.onsuccess = putChecker;
+ var request = objectStore.put("bar6");
+ request.onsuccess = function(event) {
+ putChecker(event);
+ transaction.abort();
+ }
+
+ transaction.onabort = function(event) {
+ debug("ALERT: " + "readwrite transaction abort");
+ continueTest2();
+ }
+
+ transaction.oncomplete = function(event) {
+ debug("ALERT: " + "readwrite transaction unexpected complete");
+ done();
+ }
+
+ transaction.onerror = function(event) {
+ debug("ALERT: " + "readwrite transaction unexpected error");
+ done();
+ }
+}
+
+function continueTest2()
+{
+ debug("ALERT: " + "Opening readwrite transaction to make sure the key generator had successfully reverted");
+
+ var transaction = database.transaction('TestObjectStore', "readwrite");
+ var objectStore = transaction.objectStore('TestObjectStore');
+
+ var request = objectStore.put("bar1");
+ request.onsuccess = putChecker;
+ var request = objectStore.put("bar2");
+ request.onsuccess = putChecker;
+ var request = objectStore.put("bar3");
+ request.onsuccess = putChecker;
+ var request = objectStore.put("bar4");
+ request.onsuccess = putChecker;
+ var request = objectStore.put("bar5");
+ request.onsuccess = putChecker;
+ var request = objectStore.put("bar6");
+ request.onsuccess = putChecker;
+
+ transaction.onabort = function(event) {
+ debug("ALERT: " + "readwrite transaction unexpected abort");
+ done();
+ }
+
+ transaction.oncomplete = function(event) {
+ debug("ALERT: " + "readwrite transaction complete");
+ continueTest3();
+ }
+
+ transaction.onerror = function(event) {
+ debug("ALERT: " + "readwrite transaction unexpected error");
+ done();
+ }
+}
+
+function continueTest3()
+{
+ debug("ALERT: " + "Opening readwrite transaction to make sure the key generator picks up where it should've left off");
+
+ var transaction = database.transaction('TestObjectStore', "readwrite");
+ var objectStore = transaction.objectStore('TestObjectStore');
+
+ var request = objectStore.put("bar1");
+ request.onsuccess = putChecker;
+ var request = objectStore.put("bar2");
+ request.onsuccess = putChecker;
+ var request = objectStore.put("bar3");
+ request.onsuccess = putChecker;
+ var request = objectStore.put("bar4");
+ request.onsuccess = putChecker;
+ var request = objectStore.put("bar5");
+ request.onsuccess = putChecker;
+ var request = objectStore.put("bar6");
+ request.onsuccess = putChecker;
+
+ transaction.onabort = function(event) {
+ debug("ALERT: " + "readwrite transaction unexpected abort");
+ done();
+ }
+
+ transaction.oncomplete = function(event) {
+ debug("ALERT: " + "readwrite transaction complete");
+ done();
+ }
+
+ transaction.onerror = function(event) {
+ debug("ALERT: " + "readwrite transaction unexpected error");
+ done();
+ }
+}
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesbasicaddjsfromrev195319trunkLayoutTestsstorageindexeddbmodernbasicaddhtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/basic-add.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/basic-add.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/basic-add.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/basic-add.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,74 @@
</span><ins>+description("This test does basic testing of IDBObjectStore.add(), making sure that an attempt to overwrite an already-existing key fails with the appropriate error.");
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+var request = window.indexedDB.open("NewDatabaseAddTestDatabase");
+
+function done()
+{
+ finishJSTest();
+}
+
+request.onupgradeneeded = function(event) {
+ debug("ALERT: " + "Upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var tx = request.transaction;
+ var db = event.target.result;
+
+ debug("ALERT: " + tx + " - " + tx.mode);
+ debug("ALERT: " + db);
+
+ var os = db.createObjectStore("TestObjectStore");
+ var putRequest1 = os.add("bar", "foo");
+ var putRequest2 = os.add("baz", "foo");
+
+ putRequest1.onsuccess = function(event) {
+ debug("ALERT: " + "put 1 succeeded - key was '" + putRequest1.result + "'");
+ }
+
+ putRequest1.onerror = function(event) {
+ debug("ALERT: " + "put 1 unexpectedly failed - " + event);
+ done();
+ }
+
+ putRequest2.onsuccess = function(event) {
+ debug("ALERT: " + "put 2 unexpectedly succeeded - key was '" + putRequest2.result + "'");
+ done();
+ }
+
+ putRequest2.onerror = function(event) {
+ debug("ALERT: " + "put 2 failed - " + event.type);
+
+ var getRequest = os.get("foo");
+
+ getRequest.onsuccess = function(event) {
+ debug("ALERT: " + "get succeeded - key was '" + getRequest.result + "'");
+ }
+
+ getRequest.onerror = function(event) {
+ debug("ALERT: " + "get unexpectedly failed - " + event.type);
+ done();
+ }
+
+ event.stopPropagation();
+ event.preventDefault();
+ }
+
+ tx.onabort = function(event) {
+ debug("ALERT: " + "version change transaction unexpected abort");
+ done();
+ }
+
+ tx.oncomplete = function(event) {
+ debug("ALERT: " + "version change transaction completed");
+ done();
+ }
+
+ tx.onerror = function(event) {
+ debug("ALERT: " + "version change transaction unexpected error - " + event);
+ done();
+ }
+}
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesbasicputjsfromrev195319trunkLayoutTestsstorageindexeddbmodernbasicputhtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/basic-put.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/basic-put.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/basic-put.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/basic-put.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,59 @@
</span><ins>+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+var request = window.indexedDB.open("NewDatabasePutTestDatabase");
+
+function done()
+{
+ finishJSTest();
+}
+
+request.onupgradeneeded = function(event) {
+ debug("ALERT: " + "Upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var tx = request.transaction;
+ var db = event.target.result;
+
+ debug("ALERT: " + tx + " - " + tx.mode);
+ debug("ALERT: " + db);
+
+ var os = db.createObjectStore("TestObjectStore");
+ var putRequest = os.put("bar", "foo");
+
+ putRequest.onsuccess = function(event) {
+ debug("ALERT: " + "put succeeded - key was '" + putRequest.result + "'");
+
+ var getRequest = os.get("foo");
+ getRequest.onsuccess = function(event) {
+ debug("ALERT: " + "get succeeded - value was '" + getRequest.result + "'");
+ }
+
+ getRequest.onerror = function(event) {
+ debug("ALERT: " + "get unexpectedly failed - " + event);
+ done();
+ }
+ }
+
+ putRequest.onerror = function(event) {
+ debug("ALERT: " + "put unexpectedly failed - " + event);
+ done();
+ }
+
+ tx.onabort = function(event) {
+ debug("ALERT: " + "version change transaction unexpected abort");
+ done();
+ }
+
+ tx.oncomplete = function(event) {
+ debug("ALERT: " + "version change transaction completed");
+ done();
+ }
+
+ tx.onerror = function(event) {
+ debug("ALERT: " + "version change transaction unexpected error - " + event);
+ done();
+ }
+}
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcescreateindexfailuresjsfromrev195319trunkLayoutTestsstorageindexeddbmoderncreateindexfailureshtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/create-index-failures.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/create-index-failures.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/create-index-failures.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/create-index-failures.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,124 @@
</span><ins>+description("This tests some obvious failures that can happen while calling IDBObjectStore.createIndex().");
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+function log(message)
+{
+ debug(message);
+}
+
+var createRequest = window.indexedDB.open("IDBObjectStoreCreateIndexFailuresDatabase", 1);
+var database;
+
+createRequest.onupgradeneeded = function(event) {
+ debug("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ database = event.target.result;
+ var objectStore = database.createObjectStore("TestObjectStore");
+
+ try {
+ objectStore.createIndex(null, "foo");
+ } catch(e) {
+ debug("Failed to create index with null name");
+ }
+
+ try {
+ objectStore.createIndex("TestIndex1", null);
+ } catch(e) {
+ debug("Failed to create index with invalid key path");
+ }
+
+ database.deleteObjectStore("TestObjectStore");
+ try {
+ objectStore.createIndex("TestIndex2", "foo");
+ } catch(e) {
+ debug("Failed to create index on a deleted object store");
+ }
+
+ objectStore = database.createObjectStore("TestObjectStore");
+
+ try {
+ objectStore.createIndex("TestIndex3", ["foo", "bar"], { multiEntry: true });
+ } catch(e) {
+ debug("Failed to create multi-entry index with an array key path");
+ }
+
+ objectStore.createIndex("TestIndex4", "foo");
+ try {
+ objectStore.createIndex("TestIndex4", "foo");
+ } catch(e) {
+ debug("Failed to create index that already exists");
+ }
+
+ // Spin the transaction with get requests to keep it alive long enough for the setTimeout to fire.
+ var canFinish = false;
+ var spinGet = function() {
+ objectStore.get("foo").onsuccess = function() {
+ if (!canFinish)
+ spinGet();
+ }
+ }
+ spinGet();
+
+ var createWhileInactive = function() {
+ try {
+ objectStore.createIndex("TestIndex5", "foo");
+ } catch(e) {
+ debug("Failed to create index while the transaction is inactive");
+ }
+ canFinish = true;
+ }
+
+ setTimeout(createWhileInactive, 0);
+
+ versionTransaction.onabort = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected aborted");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("Initial upgrade versionchange transaction complete");
+ continueTest1();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
+
+function continueTest1()
+{
+ var transaction = database.transaction("TestObjectStore", "readwrite");
+ var objectStore = transaction.objectStore("TestObjectStore");
+
+ try {
+ objectStore.createIndex("TestIndex6", "foo");
+ } catch(e) {
+ debug("Failed to create index outside of a version change transaction");
+ }
+
+ transaction.onabort = function(event) {
+ debug("readonly transaction unexpected abort" + event);
+ done();
+ }
+
+ transaction.oncomplete = function(event) {
+ debug("readonly transaction complete");
+ done();
+ }
+
+ transaction.onerror = function(event) {
+ debug("readonly transaction unexpected error" + event);
+ done();
+ }
+}
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcescreateobjectstorebasicjsfromrev195319trunkLayoutTestsstorageindexeddbmoderncreateobjectstorebasichtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/createobjectstore-basic.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/createobjectstore-basic.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/createobjectstore-basic.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/createobjectstore-basic.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,133 @@
</span><ins>+description("This test starts some version change transactions, creates some object stores, and variably commits or aborts the version change transactions. \
+At various stages it verifies the object stores in the database are as-expected.");
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+function dumpObjectStores(database) {
+ var list = database.objectStoreNames;
+ debug("ALERT: " + "Object store names:");
+ for (var i = 0; i < list.length; ++i) {
+ debug("ALERT: " + list[i]);
+ }
+}
+
+var createRequest = window.indexedDB.open("CreateObjectStoreTestDatabase", 1);
+
+createRequest.onupgradeneeded = function(event) {
+ debug("ALERT: " + "Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ var database = event.target.result;
+ var objectStore = database.createObjectStore("FirstAbortedObjectStore");
+ var request = objectStore.put("foo", "bar");
+
+ request.onsuccess = function(event) {
+ debug("ALERT: " + "Put succeeded");
+ versionTransaction.abort();
+ }
+ request.onerror = function(event) {
+ debug("ALERT: " + "Put failed - " + event);
+ done();
+ }
+
+ dumpObjectStores(database);
+
+ versionTransaction.onabort = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction aborted");
+ dumpObjectStores(database);
+ continueTest1();
+ database.close();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction unexpected complete");
+ done();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction error " + event);
+ }
+}
+
+function continueTest1()
+{
+ createRequest = window.indexedDB.open("CreateObjectStoreTestDatabase", 1);
+
+ createRequest.onupgradeneeded = function(event) {
+ debug("ALERT: " + "Second upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ var database = event.target.result;
+ dumpObjectStores(database);
+ var objectStore = database.createObjectStore("FirstCommittedObjectStore");
+
+ versionTransaction.onabort = function(event) {
+ debug("ALERT: " + "Second upgrade versionchange transaction unexpected abort");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("ALERT: " + "Second upgrade versionchange transaction complete");
+ dumpObjectStores(database);
+ continueTest2();
+ database.close();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("ALERT: " + "Second upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+ }
+}
+
+function continueTest2()
+{
+ createRequest = window.indexedDB.open("CreateObjectStoreTestDatabase", 2);
+
+ createRequest.onupgradeneeded = function(event) {
+ debug("ALERT: " + "Third upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ var database = event.target.result;
+ var objectStore = database.createObjectStore("SecondCommittedObjectStore");
+
+ dumpObjectStores(database);
+
+ versionTransaction.onabort = function(event) {
+ debug("ALERT: " + "Third upgrade versionchange transaction unexpected abort");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("ALERT: " + "Third upgrade versionchange transaction complete");
+ dumpObjectStores(database);
+ database.close();
+ continueTest3();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("ALERT: " + "Third upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+ }
+}
+
+function continueTest3()
+{
+ createRequest = window.indexedDB.open("CreateObjectStoreTestDatabase", 3);
+
+ createRequest.onupgradeneeded = function(event) {
+ debug("ALERT: " + "Fourth upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+ var database = event.target.result;
+ dumpObjectStores(database);
+ done();
+ }
+}
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcescreateobjectstorefailuresjsfromrev195319trunkLayoutTestsstorageindexeddbmoderncreateobjectstorefailureshtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/createobjectstore-failures.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/createobjectstore-failures.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/createobjectstore-failures.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/createobjectstore-failures.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,98 @@
</span><ins>+description("This test exercises the obvious ways that IDBDatabase.createObjectStore can fail.");
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+function dumpObjectStores(database) {
+ var list = database.objectStoreNames;
+ debug("ALERT: " + "Object store names:");
+ for (var i = 0; i < list.length; ++i) {
+ debug("ALERT: " + list[i]);
+ }
+}
+
+var createRequest = window.indexedDB.open("CreateObjectStoreFailuresTestDatabase", 1);
+var database;
+var versionTransaction;
+
+createRequest.onupgradeneeded = function(event) {
+ debug("ALERT: " + "Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ versionTransaction = createRequest.transaction;
+ database = event.target.result;
+
+ try {
+ var objectStore = database.createObjectStore('TestObjectStore', { autoIncrement: true , keyPath: "" });
+ } catch (e) {
+ debug("ALERT: " + "Failed to create object store with both autoincrement and an empty keypath: " + e);
+ dumpObjectStores(database);
+ }
+
+ try {
+ var objectStore = database.createObjectStore('TestObjectStore', { autoIncrement: true , keyPath: ['foo'] });
+ } catch (e) {
+ debug("ALERT: " + "Failed to create object store with both autoincrement and a sequence keypath: " + e);
+ dumpObjectStores(database);
+ }
+
+ try {
+ var objectStore = database.createObjectStore('TestObjectStore', { keyPath: "'foo bar'"});
+ } catch (e) {
+ debug("ALERT: " + "Failed to create object store with invalid keyPath: " + e);
+ dumpObjectStores(database);
+ }
+
+ database.createObjectStore("TestObjectStore1");
+ debug("ALERT: " + "Actually created an object store");
+ dumpObjectStores(database);
+
+ try {
+ database.createObjectStore("TestObjectStore1");
+ } catch(e) {
+ debug("ALERT: " + "Failed to create TestObjectStore a second time: " + e);
+ dumpObjectStores(database);
+ }
+
+ versionTransaction.onabort = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange unexpected abort");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction complete");
+ dumpObjectStores(database);
+
+ try {
+ database.createObjectStore("TestObjectStore2");
+ } catch(e) {
+ debug("ALERT: " + "Failed to create object store while there is no version change transaction: " + e);
+ dumpObjectStores(database);
+ }
+
+ setTimeout(finishUp, 0);
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
+
+function finishUp()
+{
+ try {
+ database.createObjectStore("TestObjectStore99");
+ } catch(e) {
+ debug("ALERT: " + "Failed to create object store outside of onupgradeneeded: " + e);
+ dumpObjectStores(database);
+ }
+
+ done();
+}
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcescursor1jsfromrev195319trunkLayoutTestsstorageindexeddbmoderncursor1html"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/cursor-1.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/cursor-1.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/cursor-1.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/cursor-1.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,89 @@
</span><ins>+description("This tests basic IDBCursor functionality");
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+function log(message)
+{
+ debug(message);
+}
+
+var createRequest = window.indexedDB.open("Cursor1Database", 1);
+
+function logCursor(cursor)
+{
+ debug("Cursor is: " + cursor);
+ debug("Cursor direction is: " + cursor.direction);
+ debug("Cursor source is: " + cursor.source + " (" + cursor.source.name + ")");
+ debug("Cursor key is: " + cursor.key);
+ debug("Cursor primary key is: " + cursor.primaryKey);
+}
+
+function setupRequest(request)
+{
+ // FIXME: Right now (until https://bugs.webkit.org/show_bug.cgi?id=151196 is resolved) what should be successful cursor operations will actually always fail.
+ request.onsuccess = function() {
+ debug("Success opening cursor");
+ logCursor(request.result);
+ }
+ request.onerror = function(e) {
+ debug("Error opening cursor (expected for now)");
+ logCursor(request.result);
+ e.stopPropagation();
+ }
+}
+
+var objectStore;
+var index;
+
+function testCursorDirection(direction)
+{
+ var range = IDBKeyRange.lowerBound(-Infinity);
+ var request = objectStore.openCursor(range, direction);
+ setupRequest(request);
+ request = index.openCursor(range, direction);
+ setupRequest(request);
+ request = index.openKeyCursor(range, direction);
+ setupRequest(request);
+}
+
+createRequest.onupgradeneeded = function(event) {
+ debug("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ var database = event.target.result;
+ objectStore = database.createObjectStore("TestObjectStore");
+ index = objectStore.createIndex("TestIndex1", "bar");
+
+ for (var i = 0; i < 10; ++i) {
+ objectStore.put("Record " + i, i);
+ }
+ objectStore.put({ bar: "Hello" }, "foo");
+
+ testCursorDirection("next");
+ testCursorDirection("nextunique");
+ testCursorDirection("prev");
+ testCursorDirection("prevunique");
+
+ versionTransaction.onabort = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected aborted");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("Initial upgrade versionchange transaction complete");
+ done();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcescursor2jsfromrev195319trunkLayoutTestsstorageindexeddbmoderncursor2html"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/cursor-2.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/cursor-2.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/cursor-2.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/cursor-2.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,82 @@
</span><ins>+description("This test checks basic functionality walking a \"next\" and \"prev\" cursor on an object store with some records.");
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+function log(message)
+{
+ debug(message);
+}
+
+var createRequest = window.indexedDB.open("Cursor2Database", 1);
+
+function logCursor(cursor)
+{
+ debug("Cursor is: " + cursor);
+ debug("Cursor direction is: " + cursor.direction);
+ debug("Cursor source is: " + cursor.source + " (" + cursor.source.name + ")");
+ debug("Cursor key is: " + cursor.key);
+ debug("Cursor value is: " + cursor.value);
+ debug("Cursor primary key is: " + cursor.primaryKey);
+}
+
+var objectStore;
+var shouldStartPrevious = true;
+function setupRequest(request)
+{
+ request.onsuccess = function() {
+ if (!request.result) {
+ if (shouldStartPrevious) {
+ setupRequest(objectStore.openCursor(IDBKeyRange.lowerBound(-Infinity), "prev"));
+ shouldStartPrevious = false;
+ }
+ return;
+ }
+
+ debug("Success iterating " + request.result.direction + " cursor");
+ logCursor(request.result);
+ request.result.continue();
+ }
+
+ request.onerror = function(e) {
+ debug("Error iterating cursor");
+ done();
+ }
+}
+
+createRequest.onupgradeneeded = function(event) {
+ debug("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ var database = event.target.result;
+ objectStore = database.createObjectStore("TestObjectStore");
+
+ for (var i = 0; i < 10; ++i) {
+ objectStore.put("Record " + i, i);
+ }
+ objectStore.put({ bar: "Hello" }, "foo");
+
+ setupRequest(objectStore.openCursor());
+
+ versionTransaction.onabort = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected aborted");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("Initial upgrade versionchange transaction complete");
+ done();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcescursor3jsfromrev195319trunkLayoutTestsstorageindexeddbmoderncursor3html"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/cursor-3.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/cursor-3.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/cursor-3.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/cursor-3.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,92 @@
</span><ins>+description("This test various uses of advance() and continue() on a \"next\" cursor.");
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+function log(message)
+{
+ debug(message);
+}
+
+var createRequest = window.indexedDB.open("Cursor3Database", 1);
+
+function logCursor(cursor)
+{
+ debug("Cursor is: " + cursor);
+ debug("Cursor direction is: " + cursor.direction);
+ debug("Cursor source is: " + cursor.source + " (" + cursor.source.name + ")");
+ debug("Cursor key is: " + cursor.key);
+ debug("Cursor value is: " + cursor.value);
+ debug("Cursor primary key is: " + cursor.primaryKey);
+}
+
+var objectStore;
+
+function setupRequest1(request)
+{
+ request.onsuccess = function() {
+ if (!request.result) {
+ setupRequest2(objectStore.openCursor());
+ return;
+ }
+ debug("Success iterating cursor");
+ logCursor(request.result);
+ request.result.continue(request.result.key + 2);
+ }
+ request.onerror = function(e) {
+ debug("Error iterating cursor");
+ done();
+ }
+}
+
+function setupRequest2(request)
+{
+ request.onsuccess = function() {
+ if (!request.result)
+ return;
+ debug("Success iterating cursor");
+ logCursor(request.result);
+ request.result.advance(3);
+ }
+ request.onerror = function(e) {
+ debug("Error iterating cursor");
+ done();
+ }
+}
+
+createRequest.onupgradeneeded = function(event) {
+ debug("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ var database = event.target.result;
+ objectStore = database.createObjectStore("TestObjectStore");
+
+ for (var i = 0; i < 10; ++i) {
+ objectStore.put("Record " + i, i);
+ }
+ objectStore.put({ bar: "Hello" }, "foo");
+
+ setupRequest1(objectStore.openCursor());
+
+ versionTransaction.onabort = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected aborted");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("Initial upgrade versionchange transaction complete");
+ done();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcescursor4jsfromrev195319trunkLayoutTestsstorageindexeddbmoderncursor4html"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/cursor-4.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/cursor-4.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/cursor-4.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/cursor-4.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,91 @@
</span><ins>+description("This test various uses of advance() and continue() on a \"prev\" cursor.");
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+function log(message)
+{
+ debug(message);
+}
+
+var createRequest = window.indexedDB.open("Cursor4Database", 1);
+
+function logCursor(cursor)
+{
+ debug("Cursor is: " + cursor);
+ debug("Cursor direction is: " + cursor.direction);
+ debug("Cursor source is: " + cursor.source + " (" + cursor.source.name + ")");
+ debug("Cursor key is: " + cursor.key);
+ debug("Cursor value is: " + cursor.value);
+ debug("Cursor primary key is: " + cursor.primaryKey);
+}
+
+var objectStore;
+
+function setupRequest1(request)
+{
+ request.onsuccess = function() {
+ if (!request.result) {
+ setupRequest2(objectStore.openCursor(IDBKeyRange.lowerBound(-Infinity), "prev"));
+ return;
+ }
+ debug("Success iterating cursor");
+ logCursor(request.result);
+ request.result.continue(request.result.key - 2);
+ }
+ request.onerror = function(e) {
+ debug("Error iterating cursor");
+ done();
+ }
+}
+
+function setupRequest2(request)
+{
+ request.onsuccess = function() {
+ if (!request.result)
+ return;
+ debug("Success iterating cursor");
+ logCursor(request.result);
+ request.result.advance(3);
+ }
+ request.onerror = function(e) {
+ debug("Error iterating cursor");
+ done();
+ }
+}
+
+createRequest.onupgradeneeded = function(event) {
+ debug("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ var database = event.target.result;
+ objectStore = database.createObjectStore("TestObjectStore");
+
+ for (var i = 0; i < 10; ++i) {
+ objectStore.put("Record " + i, i);
+ }
+
+ setupRequest1(objectStore.openCursor(IDBKeyRange.lowerBound(-Infinity), "prev"));
+
+ versionTransaction.onabort = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected aborted");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("Initial upgrade versionchange transaction complete");
+ done();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcescursor5jsfromrev195319trunkLayoutTestsstorageindexeddbmoderncursor5html"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/cursor-5.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/cursor-5.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/cursor-5.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/cursor-5.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,71 @@
</span><ins>+description("This tests iterating a \"next\" cursor in a read-write transaction while changing records.");
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+function log(message)
+{
+ debug(message);
+}
+
+var createRequest = window.indexedDB.open("Cursor5Database", 1);
+
+createRequest.onupgradeneeded = function(event) {
+ debug("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ var database = event.target.result;
+ var objectStore = database.createObjectStore("TestObjectStore");
+
+ for (var i = 0; i < 3; ++i)
+ objectStore.put("Record " + i, i);
+
+ var request = objectStore.openCursor();
+ request.onsuccess = function() {
+ debug("Cursor open at key " + request.result.key);
+
+ // This tests deleting the current record out of underneath the cursor.
+ // Its current key should be 0, after an iteration its next key should be 1.
+ objectStore.delete(0).onsuccess = function() {
+ debug("Record 0 deleted, even though that's where the cursor currently points.");
+ }
+
+ // Now that cursor iteration has begun, manually delete and then replace a record
+ // that will eventually be iterated to, making sure the new value is picked up.
+ objectStore.delete(2);
+ objectStore.put("Scary new actual record!", 2);
+
+ request.onsuccess = function() {
+ debug("Cursor iterated to key " + request.result.key);
+
+ request.onsuccess = function() {
+ debug("Cursor iterated to key " + request.result.key + " with value '" + request.result.value + "'");
+ }
+
+ request.result.continue();
+ }
+ request.result.continue();
+ }
+
+ versionTransaction.onabort = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected aborted");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("Initial upgrade versionchange transaction complete");
+ done();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcescursor6jsfromrev195319trunkLayoutTestsstorageindexeddbmoderncursor6html"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/cursor-6.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/cursor-6.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/cursor-6.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/cursor-6.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,71 @@
</span><ins>+description("This tests iterating a \"prev\" cursor in a read-write transaction while changing records.");
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+function log(message)
+{
+ debug(message);
+}
+
+var createRequest = window.indexedDB.open("Cursor6Database", 1);
+
+createRequest.onupgradeneeded = function(event) {
+ debug("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ var database = event.target.result;
+ var objectStore = database.createObjectStore("TestObjectStore");
+
+ for (var i = 0; i < 3; ++i)
+ objectStore.put("Record " + i, i);
+
+ var request = objectStore.openCursor(IDBKeyRange.lowerBound(-Infinity), "prev");
+ request.onsuccess = function() {
+ debug("Cursor open at key " + request.result.key);
+
+ // This tests deleting the current record out of underneath the cursor.
+ // Its current key should be 2, after an iteration its next key should be 1.
+ objectStore.delete(2).onsuccess = function() {
+ debug("Record 2 deleted, even though that's where the cursor currently points.");
+ }
+
+ // Now that cursor iteration has begun, manually delete and then replace a record
+ // that will eventually be iterated to, making sure the new value is picked up.
+ objectStore.delete(0);
+ objectStore.put("Scary new actual record!", 0);
+
+ request.onsuccess = function() {
+ debug("Cursor iterated to key " + request.result.key);
+
+ request.onsuccess = function() {
+ debug("Cursor iterated to key " + request.result.key + " with value '" + request.result.value + "'");
+ }
+
+ request.result.continue();
+ }
+ request.result.continue();
+ }
+
+ versionTransaction.onabort = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected aborted");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("Initial upgrade versionchange transaction complete");
+ done();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcescursor7jsfromrev195319trunkLayoutTestsstorageindexeddbmoderncursor7html"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/cursor-7.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/cursor-7.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/cursor-7.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/cursor-7.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,65 @@
</span><ins>+description("This tests iterating a \"next\" cursor in a read-write transaction combined with clearing the object store.");
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+function log(message)
+{
+ debug(message);
+}
+
+var createRequest = window.indexedDB.open("Cursor7Database", 1);
+
+createRequest.onupgradeneeded = function(event) {
+ debug("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ var database = event.target.result;
+ var objectStore = database.createObjectStore("TestObjectStore");
+
+ for (var i = 0; i < 3; ++i)
+ objectStore.put("Record " + i, i);
+
+ var request = objectStore.openCursor();
+ request.onsuccess = function() {
+ debug("Cursor open at key " + request.result.key);
+
+ // This tests deleting the current record out of underneath the cursor.
+ // Its current key should be 0, after an iteration its next key should be 1.
+ objectStore.clear().onsuccess = function() {
+ debug("Object store cleared.");
+ }
+
+ // The cursor is currently on key 0, which no longer exists.
+ // It's next key would have been 1, but the object store has been cleared.
+ // Whatever key we put in the object store that is greater than 0 will be the actual next key.
+ objectStore.put("Record 100", 100);
+
+ request.onsuccess = function() {
+ debug("Cursor iterated to key " + request.result.key);
+ }
+ request.result.continue();
+ }
+
+ versionTransaction.onabort = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected aborted");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("Initial upgrade versionchange transaction complete");
+ done();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcescursor8jsfromrev195319trunkLayoutTestsstorageindexeddbmoderncursor8html"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/cursor-8.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/cursor-8.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/cursor-8.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/cursor-8.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,65 @@
</span><ins>+description("This tests iterating a \"prev\" cursor in a read-write transaction while changing records.");
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+function log(message)
+{
+ debug(message);
+}
+
+var createRequest = window.indexedDB.open("Cursor8Database", 1);
+
+createRequest.onupgradeneeded = function(event) {
+ debug("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ var database = event.target.result;
+ var objectStore = database.createObjectStore("TestObjectStore");
+
+ for (var i = 0; i < 3; ++i)
+ objectStore.put("Record " + i, i);
+
+ var request = objectStore.openCursor(IDBKeyRange.lowerBound(-Infinity), "prev");
+ request.onsuccess = function() {
+ debug("Cursor open at key " + request.result.key);
+
+ // This tests deleting the current record out of underneath the cursor.
+ // Its current key should be 0, after an iteration its next key should be 1.
+ objectStore.clear().onsuccess = function() {
+ debug("Object store cleared.");
+ }
+
+ // The cursor is currently on key 2, which no longer exists.
+ // It's next key would have been 1, but the object store has been cleared.
+ // Whatever key we put in the object store that is less than 2 will be the actual next key.
+ objectStore.put("Record -100", -100);
+
+ request.onsuccess = function() {
+ debug("Cursor iterated to key " + request.result.key);
+ }
+ request.result.continue();
+ }
+
+ versionTransaction.onabort = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected aborted");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("Initial upgrade versionchange transaction complete");
+ done();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesdatebasicjsfromrev195319trunkLayoutTestsstorageindexeddbmoderndatebasichtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/date-basic.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/date-basic.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/date-basic.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/date-basic.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,95 @@
</span><ins>+description("This tests using Date objects as keys and values.");
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+var createRequest = window.indexedDB.open("DateBasicDatabase", 1);
+var database;
+
+var date1 = new Date("1955-11-05T00:00:00");
+var date2 = new Date("1955-11-12T18:00:00");
+var date3 = new Date("2015-10-21T16:00:00");
+
+createRequest.onupgradeneeded = function(event) {
+ debug("ALERT: " + "Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ database = event.target.result;
+ var objectStore = database.createObjectStore("TestObjectStore");
+
+ objectStore.put("Flux capacitor", date1);
+ objectStore.put("Fish under the sea", date2);
+ objectStore.put("Hoverboards", date3);
+
+ objectStore.put(date1, "a");
+ objectStore.put(date2, "b");
+ objectStore.put(date3, "c");
+
+ versionTransaction.onabort = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction unexpected aborted");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction complete");
+ continueTest1();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
+
+var objectStore;
+
+function testGet(key) {
+ var request = objectStore.get(key);
+ request.onsuccess = function()
+ {
+ debug("ALERT: " + "Success getting key '" + key + "' of type " + typeof(key) + ", result is '" + request.result + "' of type " + typeof(request.result));
+ if (key instanceof Date)
+ debug("ALERT: " + "Key is a Date object, btw");
+ if (request.result instanceof Date)
+ debug("ALERT: " + "Result is a Date object, btw");
+ }
+ request.onerror = function()
+ {
+ debug("ALERT: " + "Expected error getting key '" + key + "'");
+ }
+}
+
+function continueTest1()
+{
+ var transaction = database.transaction("TestObjectStore", "readonly");
+ objectStore = transaction.objectStore("TestObjectStore");
+
+ testGet(date1);
+ testGet(date2);
+ testGet(date3);
+ testGet("a");
+ testGet("b");
+ testGet("c");
+
+ transaction.onabort = function(event) {
+ debug("ALERT: " + "readonly transaction unexpected abort" + event);
+ done();
+ }
+
+ transaction.oncomplete = function(event) {
+ debug("ALERT: " + "readonly transaction complete");
+ done();
+ }
+
+ transaction.onerror = function(event) {
+ debug("ALERT: " + "readonly transaction unexpected error" + event);
+ done();
+ }
+}
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesdeletedatabase1jsfromrev195319trunkLayoutTestsstorageindexeddbmoderndeletedatabase1html"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/deletedatabase-1.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-1.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/deletedatabase-1.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/deletedatabase-1.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,127 @@
</span><ins>+description("This tests that if deleteDatabase is called while there is already an open connection to the database that the open connection gets the appropriate versionChange event.");
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+function log(message)
+{
+ debug(message);
+}
+
+var request = window.indexedDB.open("DeleteDatabase1TestDatabase");
+request.onsuccess = function()
+{
+ debug("open db success");
+}
+request.onerror = function(e)
+{
+ debug("Unexpected error");
+ done();
+}
+
+request.onupgradeneeded = function(e)
+{
+ debug("Initial upgrade old version - " + e.oldVersion + " new version - " + e.newVersion);
+
+ var versionTransaction = request.transaction;
+ var database = event.target.result;
+ var objectStore = database.createObjectStore("TestObjectStore");
+ objectStore.put("This is a record", 1);
+
+ request.transaction.oncomplete = function()
+ {
+ debug("Version change complete");
+ database.onversionchange = function(e)
+ {
+ debug("First connection received versionchange event: oldVersion " + e.oldVersion + ", newVersion " + e.newVersion);
+ database.close();
+ }
+ continueTest1();
+ }
+ request.transaction.onabort = function()
+ {
+ debug("Version change unexpected abort");
+ done();
+ }
+ request.transaction.onerror = function()
+ {
+ debug("Version change unexpected error");
+ done();
+ }
+}
+
+function continueTest1()
+{
+ debug("Requesting deleteDatabase");
+ var request = window.indexedDB.deleteDatabase("DeleteDatabase1TestDatabase");
+ request.onsuccess = function(e)
+ {
+ debug("Delete database success: oldVersion " + e.oldVersion + ", newVersion " + e.newVersion);
+ continueTest2();
+ }
+ request.onerror = function(e)
+ {
+ debug("Delete database unexpected error");
+ done();
+ }
+ request.onupgradeneeded = function(e)
+ {
+ debug("Delete database unexpected upgradeneeded");
+ done();
+ }
+}
+
+function continueTest2()
+{
+ debug("Recreating database to make sure it's new and empty");
+ var request = window.indexedDB.open("DeleteDatabase1TestDatabase");
+
+ request.onupgradeneeded = function(e)
+ {
+ debug("Second upgrade old version - " + e.oldVersion + " new version - " + e.newVersion);
+ var versionTransaction = request.transaction;
+
+ try {
+ var objectStore = versionTransaction.objectStore("TestObjectStore");
+ } catch(e) {
+ debug("Unable to get object store in second upgrade transaction (which is correct because it should not be there)");
+ }
+
+ versionTransaction.oncomplete = function(e)
+ {
+ debug("Second database upgrade success");
+ done();
+ }
+
+ versionTransaction.onabort = function(e)
+ {
+ debug("Second database upgrade unexpected abort");
+ done();
+ }
+
+ versionTransaction.onerror = function(e)
+ {
+ debug("Second database upgrade unexpected error");
+ done();
+ }
+ }
+
+ request.onsuccess = function(e)
+ {
+ debug("Second database opening unexpected success");
+ done();
+ }
+
+ request.onerror = function(e)
+ {
+ debug("Second database opening unexpected error");
+ done();
+ }
+}
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesdeletedatabase2jsfromrev195319trunkLayoutTestsstorageindexeddbmoderndeletedatabase2html"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/deletedatabase-2.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-2.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/deletedatabase-2.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/deletedatabase-2.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,144 @@
</span><ins>+description("This tests that if deleteDatabase is called while there is already an open connection to the database that the open connection gets the appropriate versionChange event. \
+That open connection also has an in-progress transaction at the time it gets the versionChange event.");
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+function log(message)
+{
+ debug(message);
+}
+
+var stopSpinning = false;
+
+var request = window.indexedDB.open("DeleteDatabase2TestDatabase");
+request.onsuccess = function()
+{
+ debug("open db success");
+}
+request.onerror = function(e)
+{
+ debug("Open request error: " + request.error.name);
+}
+
+request.onupgradeneeded = function(e)
+{
+ debug("Initial upgrade old version - " + e.oldVersion + " new version - " + e.newVersion);
+
+ var versionTransaction = request.transaction;
+ var database = event.target.result;
+ var objectStore = database.createObjectStore("TestObjectStore");
+ objectStore.put("This is a record", 1);
+
+ // Spin the transaction until told to stop spinning it.
+ var keepGoing = function() {
+ if (!stopSpinning)
+ objectStore.get(1).onsuccess = keepGoing;
+ }
+ objectStore.get(1).onsuccess = keepGoing;
+
+ database.onversionchange = function(e)
+ {
+ debug("First connection received versionchange event: oldVersion " + e.oldVersion + ", newVersion " + e.newVersion);
+
+ var shutErDown = function() {
+ database.close();
+ stopSpinning = true;
+ }
+ window.setTimeout(shutErDown, 0);
+ }
+
+ request.transaction.oncomplete = function()
+ {
+ debug("First version change complete");
+ }
+
+ request.transaction.onabort = function()
+ {
+ debug("Version change unexpected abort");
+ done();
+ }
+ request.transaction.onerror = function()
+ {
+ debug("Version change unexpected error");
+ done();
+ }
+
+ window.setTimeout(continueTest1, 0);
+}
+
+function continueTest1()
+{
+ debug("Requesting deleteDatabase");
+ var request = window.indexedDB.deleteDatabase("DeleteDatabase2TestDatabase");
+ request.onsuccess = function(e)
+ {
+ debug("Delete database success: oldVersion " + e.oldVersion + ", newVersion " + e.newVersion);
+ continueTest2();
+ }
+ request.onerror = function(e)
+ {
+ debug("Delete database unexpected error");
+ done();
+ }
+ request.onupgradeneeded = function(e)
+ {
+ debug("Delete database unexpected upgradeneeded");
+ done();
+ }
+}
+
+function continueTest2()
+{
+ debug("Recreating database to make sure it's new and empty");
+ var request = window.indexedDB.open("DeleteDatabase2TestDatabase");
+
+ request.onupgradeneeded = function(e)
+ {
+ debug("Second upgrade old version - " + e.oldVersion + " new version - " + e.newVersion);
+ var versionTransaction = request.transaction;
+
+ try {
+ var objectStore = versionTransaction.objectStore("TestObjectStore");
+ } catch(e) {
+ debug("Unable to get object store in second upgrade transaction (which is correct because it should not be there)");
+ }
+
+ versionTransaction.oncomplete = function(e)
+ {
+ debug("Second database upgrade success");
+ done();
+ }
+
+ versionTransaction.onabort = function(e)
+ {
+ debug("Second database upgrade unexpected abort");
+ done();
+ }
+
+ versionTransaction.onerror = function(e)
+ {
+ debug("Second database upgrade unexpected error");
+ done();
+ }
+ }
+
+ request.onsuccess = function(e)
+ {
+ debug("Second database opening unexpected success");
+ done();
+ }
+
+ request.onerror = function(e)
+ {
+ debug("Second database opening unexpected error");
+ done();
+ }
+}
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesdeletedatabasenullnameexceptionjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/modern/resources/deletedatabase-null-name-exception.js (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/deletedatabase-null-name-exception.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/deletedatabase-null-name-exception.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+description("This test calls deleteDatabase on window.indexedDB with a null database name, making sure there is an exception.");
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+try {
+ var request = window.indexedDB.deleteDatabase();
+} catch (e) {
+ debug("ALERT: " + e);
+}
+
+done();
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesdeletedatabaserequesteventjsfromrev195319trunkLayoutTestsstorageindexeddbmoderndeletedatabaserequesteventhtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/deletedatabase-request-event.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/deletedatabase-request-event.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/deletedatabase-request-event.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/deletedatabase-request-event.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+description("This test calls deleteDatabase on window.indexedDB and verifies that an event is fired at the request.");
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+var request = window.indexedDB.deleteDatabase("TestDatabase");
+
+request.onsuccess = function()
+{
+ debug("ALERT: " + "success");
+ done();
+}
+request.onerror = function(e)
+{
+ debug("ALERT: " + "error " + e);
+ done();
+}
+
+debug("ALERT: " + request);
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesdeletedatabaserequestjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/modern/resources/deletedatabase-request.js (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/deletedatabase-request.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/deletedatabase-request.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+description("This test calls deleteDatabase on window.indexedDB and verifies that an IDBOpenDBRequest object is returned.");
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+var request = window.indexedDB.deleteDatabase("TestDatabase");
+debug("ALERT: " + request);
+
+done();
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesdeleteindex1jsfromrev195319trunkLayoutTestsstorageindexeddbmoderndeleteindex1html"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/deleteindex-1.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/deleteindex-1.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/deleteindex-1.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/deleteindex-1.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,107 @@
</span><ins>+description("This tests deleting an index and then committing the transaction.");
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+function log(message)
+{
+ debug(message);
+}
+
+var index;
+var objectStore;
+var database;
+
+function checkIndexValues()
+{
+ var countRequest = index.count();
+ countRequest.onsuccess = function() {
+ debug("Count is: " + countRequest.result);
+ }
+
+ var cursorRequest = index.openCursor();
+ cursorRequest.onsuccess = function() {
+ var cursor = cursorRequest.result;
+ if (!cursor) {
+ objectStore.deleteIndex("TestIndex1");
+ debug("Deleted the index");
+ return;
+ }
+
+ debug("Cursor at record: " + cursor.key + " / " + cursor.primaryKey);
+ cursor.continue();
+ }
+ cursorRequest.onerror = function(e) {
+ debug("Unexpected error opening or iterating cursor");
+ logCursor(cursorRequest.result);
+ done();
+ }
+}
+
+var createRequest = window.indexedDB.open("DeleteIndex1Database", 1);
+createRequest.onupgradeneeded = function(event) {
+ debug("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ database = event.target.result;
+ objectStore = database.createObjectStore("TestObjectStore");
+ objectStore.put({ bar: "A" }, 1);
+ objectStore.put({ bar: "A" }, 2);
+
+ index = objectStore.createIndex("TestIndex1", "bar");
+
+ checkIndexValues();
+
+ versionTransaction.onabort = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected abort");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("Initial upgrade versionchange transaction complete");
+ continueTest();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
+
+function continueTest() {
+ var transaction = database.transaction("TestObjectStore");
+ objectStore = transaction.objectStore("TestObjectStore");
+
+ var names = objectStore.indexNames;
+ debug("Object store has indexes:")
+ for (var i = 0; i < names.length; ++i)
+ debug(names[i]);
+
+ try {
+ objectStore.index("TestIndex1");
+ } catch(e) {
+ debug("Unable to get index from object store (it shouldn't exist)");
+ }
+
+ transaction.onabort = function(event) {
+ debug("Transaction unexpected abort");
+ done();
+ }
+
+ transaction.oncomplete = function(event) {
+ debug("Transaction complete");
+ done();
+ }
+
+ transaction.onerror = function(event) {
+ debug("Transaction unexpected error" + event);
+ done();
+ }
+}
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesdeleteindex2jsfromrev195319trunkLayoutTestsstorageindexeddbmoderndeleteindex2html"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/deleteindex-2.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/deleteindex-2.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/deleteindex-2.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/deleteindex-2.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,132 @@
</span><ins>+description("This tests deleting an index and then aborting the transaction.");
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+function log(message)
+{
+ debug(message);
+}
+
+var index;
+var objectStore;
+var database;
+
+function checkIndexValues()
+{
+ var countRequest = index.count();
+ countRequest.onsuccess = function() {
+ debug("Count is: " + countRequest.result);
+ }
+
+ var cursorRequest = index.openCursor();
+ cursorRequest.onsuccess = function() {
+ var cursor = cursorRequest.result;
+ if (!cursor)
+ return;
+
+ debug("Cursor at record: " + cursor.key + " / " + cursor.primaryKey);
+ cursor.continue();
+ }
+ cursorRequest.onerror = function(e) {
+ debug("Unexpected error opening or iterating cursor");
+ logCursor(cursorRequest.result);
+ done();
+ }
+}
+
+var createRequest = window.indexedDB.open("DeleteIndex2Database", 1);
+createRequest.onupgradeneeded = function(event) {
+ debug("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ database = event.target.result;
+ objectStore = database.createObjectStore("TestObjectStore");
+ objectStore.put({ bar: "A" }, 1);
+ objectStore.put({ bar: "A" }, 2);
+
+ index = objectStore.createIndex("TestIndex1", "bar");
+
+ checkIndexValues();
+
+ versionTransaction.onabort = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected abort");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("Initial upgrade versionchange transaction complete");
+ database.close();
+ continueTest1();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
+
+function continueTest1() {
+ var createRequest = window.indexedDB.open("DeleteIndex2Database", 2);
+ createRequest.onupgradeneeded = function(event) {
+ debug("Second upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ database = event.target.result;
+ var versionTransaction = createRequest.transaction;
+ objectStore = versionTransaction.objectStore("TestObjectStore");
+ objectStore.deleteIndex("TestIndex1");
+ debug("Deleted the index");
+ versionTransaction.abort();
+ debug("Aborted the transaction");
+
+ versionTransaction.onabort = function(event) {
+ debug("Second upgrade versionchange transaction abort");
+ database.close();
+ continueTest2();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("Second upgrade versionchange transaction unexpected complete");
+ done();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("Second upgrade versionchange transaction error " + event);
+ }
+ }
+}
+
+function continueTest2() {
+ var createRequest = window.indexedDB.open("DeleteIndex2Database", 3);
+ createRequest.onupgradeneeded = function(event) {
+ debug("Third upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ objectStore = versionTransaction.objectStore("TestObjectStore");
+ index = objectStore.index("TestIndex1");
+
+ checkIndexValues();
+
+ versionTransaction.onabort = function(event) {
+ debug("Third upgrade versionchange transaction unexpected abort");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("Third upgrade versionchange transaction complete");
+ done();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("Third upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+ }
+}
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesdeleteobjectstore1jsfromrev195319trunkLayoutTestsstorageindexeddbmoderndeleteobjectstore1html"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/deleteobjectstore-1.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/deleteobjectstore-1.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/deleteobjectstore-1.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/deleteobjectstore-1.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,135 @@
</span><ins>+description("This test creates an object store then populates it, then commits that transaction. \
+It then deletes it, but aborts that transaction. \
+Finally it checks to make sure everything from step 1 is there as expected.");
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+var createRequest = window.indexedDB.open("DeleteObjectStore1Database", 1);
+
+createRequest.onupgradeneeded = function(event) {
+ debug("ALERT: " + "Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ var database = event.target.result;
+ var objectStore = database.createObjectStore("TestObjectStore");
+ for (var i = 0; i < 10; ++i)
+ objectStore.put("AH AH AH AH AH", i + " puts");
+
+ versionTransaction.onabort = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction unexpected aborted");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction complete");
+ database.close();
+ continueTest1();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
+
+function getChecker(event) {
+ debug("ALERT: " + "Value gotten was " + event.target.result);
+}
+
+function continueTest1()
+{
+ var openRequest = window.indexedDB.open("DeleteObjectStore1Database", 2);
+
+ openRequest.onerror = function(event) {
+ debug("ALERT: " + "Request error - " + event);
+ }
+ openRequest.onblocked = function(event) {
+ debug("ALERT: " + "Request unexpected blocked - " + event);
+ done();
+ }
+ openRequest.onsuccess = function(event) {
+ debug("ALERT: " + "Request unexpected success - " + event);
+ done();
+ }
+
+ openRequest.onupgradeneeded = function(event) {
+ debug("ALERT: " + "Second upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+ var versionTransaction = openRequest.transaction;
+ var database = event.target.result;
+ var objectStore = versionTransaction.objectStore("TestObjectStore");
+
+ debug("ALERT: " + "Deleting object store");
+ database.deleteObjectStore("TestObjectStore");
+
+ versionTransaction.abort();
+
+ versionTransaction.onabort = function(event) {
+ debug("ALERT: " + "Second version change transaction abort");
+ continueTest2();
+ database.close();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("ALERT: " + "Second version change transaction unexpected complete");
+ done();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("ALERT: " + "Second version change transaction error - " + event);
+ }
+ }
+}
+
+function continueTest2()
+{
+ var openRequest = window.indexedDB.open("DeleteObjectStore1Database", 1);
+
+ openRequest.onerror = function(event) {
+ debug("ALERT: " + "Request unexpected error - " + event);
+ done();
+ }
+ openRequest.onblocked = function(event) {
+ debug("ALERT: " + "Request unexpected blocked - " + event);
+ done();
+ }
+ openRequest.onupgradeneeded = function(event) {
+ debug("ALERT: " + "Request unexpected upgradeneeded - " + event);
+ done();
+ }
+
+ openRequest.onsuccess = function(event) {
+ debug("ALERT: " + "Success opening database connection - Starting final transaction");
+ var database = event.target.result;
+ var transaction = database.transaction("TestObjectStore", "readwrite");
+ var objectStore = transaction.objectStore("TestObjectStore");
+
+ var request;
+ for (var i = 0; i < 10; ++i) {
+ request = objectStore.get(i + " puts");
+ request.onsuccess = getChecker;
+ }
+
+ transaction.onabort = function(event) {
+ debug("ALERT: " + "Final transaction unexpected abort");
+ done();
+ }
+
+ transaction.oncomplete = function(event) {
+ debug("ALERT: " + "Final transaction complete");
+ done();
+ }
+
+ transaction.onerror = function(event) {
+ debug("ALERT: " + "Final transaction unexpected error - " + event);
+ done();
+ }
+ }
+}
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesdoubleabortjsfromrev195319trunkLayoutTestsstorageindexeddbmoderndoubleaborthtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/double-abort.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/double-abort.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/double-abort.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/double-abort.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+description("This test aborts the same transaction twice, making the appropriate exception is thrown.");
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+var createRequest = window.indexedDB.open("DoubleAbortTestDatabase", 1);
+
+createRequest.onupgradeneeded = function(event) {
+ debug("ALERT: " + "Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ var database = event.target.result;
+
+ versionTransaction.abort();
+ try {
+ versionTransaction.abort();
+ } catch (e) {
+ debug("ALERT: " + "Second abort failed: " + e);
+ }
+
+ versionTransaction.onabort = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction aborted");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction unexpected complete");
+ done();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesdoubleopenjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/modern/resources/double-open.js (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/double-open.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/double-open.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+description("This test makes sure that quickly opening the same database multiple times is successful without the backend ASSERTing or crashing.");
+
+function log(msg)
+{
+ document.getElementById("logger").innerHTML += msg + "";
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+if (testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+}
+
+var req1 = indexedDB.open("testDB");
+req1.onerror = function() {
+ debug("First request unexpected error");
+ done();
+}
+
+var req2 = indexedDB.open("testDB");
+req2.onsuccess = function() {
+ debug("Second request done");
+ done();
+}
+req2.onerror = function() {
+ debug("Second request unexpected error");
+ done();
+}
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesgetindexfailuresjsfromrev195319trunkLayoutTestsstorageindexeddbmoderngetindexfailureshtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/get-index-failures.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/get-index-failures.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/get-index-failures.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/get-index-failures.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,114 @@
</span><ins>+description("This tests some obvious failures that can happen while calling IDBObjectStore.index().");
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+function log(message)
+{
+ debug(message);
+}
+
+var createRequest = window.indexedDB.open("IDBObjectStoreGetIndexFailuresDatabase", 1);
+var database;
+
+createRequest.onupgradeneeded = function(event) {
+ debug("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ database = event.target.result;
+ var objectStore = database.createObjectStore("TestObjectStore");
+ objectStore.createIndex("TestIndex", "foo");
+
+ versionTransaction.onabort = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected aborted");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("Initial upgrade versionchange transaction complete");
+ continueTest1();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
+
+function continueTest1()
+{
+ var transaction = database.transaction("TestObjectStore", "readonly");
+ var objectStore = transaction.objectStore("TestObjectStore");
+
+ var index = objectStore.index("TestIndex");
+ debug("Got an index as expected: " + index);
+
+ try {
+ objectStore.index(null);
+ } catch(e) {
+ debug("Failed to get an index with a null name");
+ }
+
+ try {
+ objectStore.index("DoesNotExistdex");
+ } catch(e) {
+ debug("Failed to get an index that doesn't exist");
+ }
+
+ transaction.onabort = function(event) {
+ debug("readonly transaction unexpected abort" + event);
+ done();
+ }
+
+ transaction.oncomplete = function(event) {
+ debug("readonly transaction complete");
+ continueTest2();
+ database.close();
+ }
+
+ transaction.onerror = function(event) {
+ debug("readonly transaction unexpected error" + event);
+ done();
+ }
+}
+
+function continueTest2()
+{
+ var createRequest = window.indexedDB.open("IDBObjectStoreGetIndexFailuresDatabase", 2);
+ createRequest.onupgradeneeded = function(event) {
+ debug("Second upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ var database = event.target.result;
+ var objectStore = versionTransaction.objectStore("TestObjectStore");
+ database.deleteObjectStore("TestObjectStore");
+
+ try {
+ objectStore.index("TestIndex");
+ } catch(e) {
+ debug("Failed to get an index from a deleted object store");
+ }
+
+ versionTransaction.onabort = function(event) {
+ debug("Second versionchange transaction unexpected aborted");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("Second versionchange transaction complete");
+ done();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("Second versionchange transaction unexpected error" + event);
+ done();
+ }
+ }
+}
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesgetkeyrangejsfromrev195319trunkLayoutTestsstorageindexeddbmoderngetkeyrangehtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/get-keyrange.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/get-keyrange.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/get-keyrange.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/get-keyrange.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,166 @@
</span><ins>+description("This test exercises IDBObjectStore.get() with an IDBKeyRange as the parameter.");
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+var createRequest = window.indexedDB.open("GetKeyRangeDatabase", 1);
+var database;
+
+var date1 = new Date("1955-11-05T00:00:00");
+var date2 = new Date("1955-11-12T18:00:00");
+var date3 = new Date("2015-10-21T16:00:00");
+
+createRequest.onupgradeneeded = function(event) {
+ debug("ALERT: " + "Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ database = event.target.result;
+ var objectStore = database.createObjectStore("TestObjectStore");
+
+ objectStore.put("Flux capacitor", date1);
+ objectStore.put("Fish under the sea", date2);
+ objectStore.put("Hoverboards", date3);
+
+ for (var i = 0; i < 100; ++i)
+ objectStore.put("\"" + i + "\"", i);
+
+ objectStore.put("PosInf", Infinity);
+ objectStore.put("NegInf", -Infinity);
+
+ objectStore.put("A", "A");
+ objectStore.put("As", "As");
+ objectStore.put("AS", "AS");
+ objectStore.put("a", "a");
+
+ objectStore.put("array 1", [1, "hello"]);
+ objectStore.put("array 2", [2, "goodbye"]);
+ objectStore.put("array 3", []);
+
+ versionTransaction.onabort = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction unexpected aborted");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction complete");
+ continueTest1();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
+
+var objectStore;
+
+function testGet(keyRange) {
+ var request = objectStore.get(keyRange);
+ request.onsuccess = function()
+ {
+ debug("ALERT: " + "Success getting keyRange [" + keyRange.lower + " (" + (keyRange.lowerOpen ? "Open" : "Closed") + "), " + keyRange.upper + " (" + (keyRange.upperOpen ? "Open" : "Closed") + ")]");
+ debug("ALERT: " + "Result is " + request.result);
+ }
+ request.onerror = function()
+ {
+ debug("ALERT: " + "Unexpected error getting keyRange [" + keyRange.lower + " (" + keyRange.lowerOpen + "), " + keyRange.upper + " (" + keyRange.upperOpen + ")]");
+ }
+}
+
+function continueTest1()
+{
+ var transaction = database.transaction("TestObjectStore", "readonly");
+ objectStore = transaction.objectStore("TestObjectStore");
+
+ testGet(IDBKeyRange.lowerBound(-1));
+ testGet(IDBKeyRange.lowerBound(-1, true));
+ testGet(IDBKeyRange.lowerBound(0));
+ testGet(IDBKeyRange.lowerBound(0, true));
+ testGet(IDBKeyRange.lowerBound(0.1));
+ testGet(IDBKeyRange.lowerBound(0.1, true));
+ testGet(IDBKeyRange.lowerBound(99));
+ testGet(IDBKeyRange.lowerBound(99, true));
+ testGet(IDBKeyRange.lowerBound(99.1));
+ testGet(IDBKeyRange.lowerBound(99.1, true));
+
+ testGet(IDBKeyRange.upperBound(100));
+ testGet(IDBKeyRange.upperBound(100, true));
+ testGet(IDBKeyRange.upperBound(99));
+ testGet(IDBKeyRange.upperBound(99, true));
+ testGet(IDBKeyRange.upperBound(98.99999));
+ testGet(IDBKeyRange.upperBound(98.99999, true));
+ testGet(IDBKeyRange.upperBound(98));
+ testGet(IDBKeyRange.upperBound(98, true));
+ testGet(IDBKeyRange.upperBound(0));
+ testGet(IDBKeyRange.upperBound(0, true));
+ testGet(IDBKeyRange.upperBound(-0.1));
+ testGet(IDBKeyRange.upperBound(-0.1, true));
+
+ testGet(IDBKeyRange.bound(2.5, 3.5));
+ testGet(IDBKeyRange.bound(-0.5, 0.5));
+ testGet(IDBKeyRange.bound(98.5, 99.5));
+ testGet(IDBKeyRange.bound(-1, 0));
+ testGet(IDBKeyRange.bound(-1, 0, true));
+ testGet(IDBKeyRange.bound(-1, 0, false, true));
+ testGet(IDBKeyRange.bound(-1, 0, true, true));
+ testGet(IDBKeyRange.bound(3, 4));
+ testGet(IDBKeyRange.bound(3, 4, true));
+ testGet(IDBKeyRange.bound(3, 4, false, true));
+ testGet(IDBKeyRange.bound(3, 4, true, true));
+ testGet(IDBKeyRange.bound(99, 100));
+ testGet(IDBKeyRange.bound(99, 100, true));
+ testGet(IDBKeyRange.bound(99, 100, false, true));
+ testGet(IDBKeyRange.bound(99, 100, true, true));
+
+ testGet(IDBKeyRange.bound(Infinity, "a"));
+ testGet(IDBKeyRange.bound(Infinity, "a", true));
+ testGet(IDBKeyRange.bound(Infinity, "a", false, true));
+ testGet(IDBKeyRange.bound(Infinity, "a", true, true));
+
+ testGet(IDBKeyRange.bound("AS", "a"));
+ testGet(IDBKeyRange.bound("AS", "a", true));
+ testGet(IDBKeyRange.bound("AS", "a", false, true));
+ testGet(IDBKeyRange.bound("AS", "a", true, true));
+
+ testGet(IDBKeyRange.bound(Infinity, []));
+ testGet(IDBKeyRange.bound(Infinity, [], true));
+ testGet(IDBKeyRange.bound(Infinity, [], false, true));
+ testGet(IDBKeyRange.bound(Infinity, [], true, true));
+
+ testGet(IDBKeyRange.bound(Infinity, "a"));
+ testGet(IDBKeyRange.bound(Infinity, "a", true));
+ testGet(IDBKeyRange.bound(Infinity, "a", false, true));
+ testGet(IDBKeyRange.bound(Infinity, "a", true, true));
+
+ testGet(IDBKeyRange.bound(Infinity, "a"));
+ testGet(IDBKeyRange.bound(Infinity, "a", true));
+ testGet(IDBKeyRange.bound(Infinity, "a", false, true));
+ testGet(IDBKeyRange.bound(Infinity, "a", true, true));
+
+ testGet(IDBKeyRange.bound(date1, date3));
+ testGet(IDBKeyRange.bound(date1, date3, true));
+ testGet(IDBKeyRange.bound(date1, date3, false, true));
+ testGet(IDBKeyRange.bound(date1, date3, true, true));
+
+ transaction.onabort = function(event) {
+ debug("ALERT: " + "readonly transaction unexpected abort" + event);
+ done();
+ }
+
+ transaction.oncomplete = function(event) {
+ debug("ALERT: " + "readonly transaction complete");
+ done();
+ }
+
+ transaction.onerror = function(event) {
+ debug("ALERT: " + "readonly transaction unexpected error" + event);
+ done();
+ }
+}
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesidbdatabasedeleteobjectstorefailuresjsfromrev195319trunkLayoutTestsstorageindexeddbmodernidbdatabasedeleteobjectstorefailureshtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/idbdatabase-deleteobjectstore-failures.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/idbdatabase-deleteobjectstore-failures.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/idbdatabase-deleteobjectstore-failures.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/idbdatabase-deleteobjectstore-failures.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,140 @@
</span><ins>+description("This tests some obvious failures that can happen while calling IDBDatabase.deleteObjectStore()");
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+var createRequest = window.indexedDB.open("IDBDatabaseDeleteObjectStoreFailuresDatabase", 1);
+var database;
+
+createRequest.onupgradeneeded = function(event) {
+ debug("ALERT: " + "Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ database = event.target.result;
+ var objectStore = database.createObjectStore("TestObjectStore");
+ var request = objectStore.put("bar", "foo");
+
+ versionTransaction.onabort = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction unexpected aborted");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction complete");
+ continueTest1();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
+
+function continueTest1()
+{
+ var transaction = database.transaction("TestObjectStore", "readwrite");
+ var objectStore = transaction.objectStore("TestObjectStore");
+ var request = objectStore.put("baz", "foo");
+
+ request.onsuccess = function() {
+ debug("ALERT: " + "readwrite put success - about to try to delete an objectstore");
+ try {
+ database.deleteObjectStore("TestObjectStore");
+ } catch(e) {
+ debug("ALERT: " + "Failed to deleteObjectStore without a versionchange transaction - " + e);
+ }
+ }
+
+ transaction.onabort = function(event) {
+ debug("ALERT: " + "readwrite transaction unexpected aborted");
+ done();
+ }
+
+ transaction.oncomplete = function(event) {
+ debug("ALERT: " + "readwrite transaction complete");
+ database.close();
+ continueTest2();
+ }
+
+ transaction.onerror = function(event) {
+ debug("ALERT: " + "readwrite transaction unexpected error" + event);
+ done();
+ }
+}
+
+function continueTest2()
+{
+ var openRequest = window.indexedDB.open("IDBDatabaseDeleteObjectStoreFailuresDatabase", 2);
+
+ openRequest.onerror = function(event) {
+ debug("ALERT: " + "Request unexpected error - " + event);
+ done();
+ }
+ openRequest.onblocked = function(event) {
+ debug("ALERT: " + "Request unexpected blocked - " + event);
+ done();
+ }
+ openRequest.onsuccess = function(event) {
+ debug("ALERT: " + "Request unexpected success - " + event);
+ done();
+ }
+
+ openRequest.onupgradeneeded = function(event) {
+ debug("ALERT: " + "Second upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = openRequest.transaction;
+ database = event.target.result;
+
+ try {
+ database.deleteObjectStore("NonexistentObjectStore");
+ } catch(e) {
+ debug("ALERT: " + "Failed to deleteObjectStore with a non-existent objectstore - " + e);
+ }
+
+ // Spin the transaction with get requests to keep it alive long enough for the setTimeout to fire.
+ var objectStore = versionTransaction.objectStore("TestObjectStore");
+ var canFinish = false;
+ var spinGet = function() {
+ objectStore.get("foo").onsuccess = function() {
+ if (!canFinish)
+ spinGet();
+ }
+ }
+ spinGet();
+
+ // After the versionChange transaction becomes inactive, but while it's still in-progress, try to delete the objectstore
+ var tryInactiveDelete = function()
+ {
+ try {
+ database.deleteObjectStore("TestObjectStore");
+ } catch(e) {
+ debug("ALERT: " + "Failed to deleteObjectStore with an in-progress versionchange transaction that is inactive - " + e);
+ }
+ canFinish = true;
+ }
+
+ setTimeout(tryInactiveDelete, 0);
+
+ versionTransaction.onabort = function(event) {
+ debug("ALERT: " + "Second version change transaction unexpected abort");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("ALERT: " + "Second version change transaction complete");
+ done();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("ALERT: " + "Second version change transaction unexpected error - " + event);
+ done();
+ }
+ }
+}
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesidbdatabasetransactionfailuresjsfromrev195319trunkLayoutTestsstorageindexeddbmodernidbdatabasetransactionfailureshtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/idbdatabase-transaction-failures.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/idbdatabase-transaction-failures.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/idbdatabase-transaction-failures.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/idbdatabase-transaction-failures.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,85 @@
</span><ins>+description("This tests some obvious failures that can happen while calling IDBDatabase.transaction()");
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+var createRequest = window.indexedDB.open("IDBDatabaseTransactionFailuresDatabase");
+var database;
+
+createRequest.onupgradeneeded = function(event) {
+ debug("ALERT: " + "Upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ database = event.target.result;
+ var objectStore = database.createObjectStore("TestObjectStore");
+ var request = objectStore.put("foo", "bar");
+
+ request.onerror = function(event) {
+ debug("ALERT: " + "put FAILED - " + event);
+ done();
+ }
+
+ try {
+ database.transaction("TestObjectStore", "readonly");
+ } catch(e) {
+ debug("ALERT: " + "Failed to start a transaction while a versionChange transaction was in progress - " + e);
+ }
+
+ versionTransaction.onabort = function(event) {
+ debug("ALERT: " + "versionchange transaction aborted");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("ALERT: " + "versionchange transaction completed");
+ continueTest();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("ALERT: " + "versionchange transaction error'ed - " + event);
+ done();
+ }
+}
+
+function continueTest()
+{
+ try {
+ database.transaction([], "readonly");
+ } catch(e) {
+ debug("ALERT: " + "Failed to start a transaction with an empty set of object stores - " + e);
+ }
+
+ try {
+ database.transaction("NonexistentObjectStore", "readonly");
+ } catch(e) {
+ debug("ALERT: " + "Failed to start a transaction to a nonexistent object store - " + e);
+ }
+
+ try {
+ database.transaction("TestObjectStore", "blahblah");
+ } catch(e) {
+ debug("ALERT: " + "Failed to start a transaction with an invalid mode - " + e);
+ }
+
+ try {
+ database.transaction("TestObjectStore", "versionchange");
+ } catch(e) {
+ debug("ALERT: " + "Failed to explicitly start a versionchange transaction - " + e);
+ }
+
+ try {
+ database.close();
+ database.transaction("TestObjectStore", "readonly");
+ } catch(e) {
+ debug("ALERT: " + "Failed to explicitly start a transaction with the close pending flag set - " + e);
+ }
+
+ done();
+}
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesidbindexpropertiesbasicjsfromrev195319trunkLayoutTestsstorageindexeddbmodernidbindexpropertiesbasichtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/idbindex-properties-basic.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/idbindex-properties-basic.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/idbindex-properties-basic.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/idbindex-properties-basic.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,94 @@
</span><ins>+description("This tests getting basic properties on an IDBIndex.");
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+function gol(message)
+{
+ debug("ALERT: " + message);
+}
+
+function logIndex(index)
+{
+ debug("ALERT: " + index.name);
+ debug("ALERT: " + index.objectStore);
+ debug("ALERT: " + index.objectStore.name);
+ debug("ALERT: " + index.keyPath);
+ debug("ALERT: " + index.multiEntry);
+ debug("ALERT: " + index.unique);
+}
+
+var createRequest = window.indexedDB.open("IDBIndexPropertiesBasicDatabase", 1);
+var database;
+
+var indexes = new Array();
+
+createRequest.onupgradeneeded = function(event) {
+ debug("ALERT: " + "Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ database = event.target.result;
+ var objectStore = database.createObjectStore("TestObjectStore");
+
+ indexes.push(objectStore.createIndex("TestIndex1", "foo"));
+ indexes.push(objectStore.createIndex("TestIndex2", "foo", { unique: false, multiEntry: false }));
+ indexes.push(objectStore.createIndex("TestIndex3", "foo", { unique: true, multiEntry: false }));
+ indexes.push(objectStore.createIndex("TestIndex4", "foo", { unique: false, multiEntry: true }));
+ indexes.push(objectStore.createIndex("TestIndex5", "foo", { unique: true, multiEntry: true }));
+ indexes.push(objectStore.createIndex("TestIndex6", [ "foo" ]));
+ indexes.push(objectStore.createIndex("TestIndex7", [ "foo", "bar" ]));
+
+ for (index in indexes)
+ logIndex(indexes[index]);
+
+ versionTransaction.onabort = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction unexpected aborted");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction complete");
+ continueTest1();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
+
+function continueTest1()
+{
+ var transaction = database.transaction("TestObjectStore", "readonly");
+ var objectStore = transaction.objectStore("TestObjectStore");
+
+ logIndex(objectStore.index("TestIndex1"));
+ logIndex(objectStore.index("TestIndex2"));
+ logIndex(objectStore.index("TestIndex3"));
+ logIndex(objectStore.index("TestIndex4"));
+ logIndex(objectStore.index("TestIndex5"));
+ logIndex(objectStore.index("TestIndex6"));
+ logIndex(objectStore.index("TestIndex7"));
+
+ transaction.onabort = function(event) {
+ debug("ALERT: " + "readonly transaction unexpected abort" + event);
+ done();
+ }
+
+ transaction.oncomplete = function(event) {
+ debug("ALERT: " + "readonly transaction complete");
+ done();
+ }
+
+ transaction.onerror = function(event) {
+ debug("ALERT: " + "readonly transaction unexpected error" + event);
+ done();
+ }
+}
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesidbobjectstoreclear1jsfromrev195319trunkLayoutTestsstorageindexeddbmodernidbobjectstoreclear1html"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/idbobjectstore-clear-1.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-clear-1.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/idbobjectstore-clear-1.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/idbobjectstore-clear-1.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,107 @@
</span><ins>+description("This test creates an object store then populates it. \
+It then clears it and makes sure it has nothing left in it.");
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+var createRequest = window.indexedDB.open("IDBObjectStoreClearDatabase", 1);
+
+createRequest.onupgradeneeded = function(event) {
+ debug("ALERT: " + "Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ var database = event.target.result;
+ var objectStore = database.createObjectStore("TestObjectStore", { autoIncrement: true });
+ var request = objectStore.put("bar1");
+ var request = objectStore.put("bar2");
+ var request = objectStore.put("bar3");
+ var request = objectStore.put("bar4");
+ var request = objectStore.put("bar5");
+ var request = objectStore.put("bar6");
+ var request = objectStore.put("bar7");
+ var request = objectStore.put("bar8");
+ var request = objectStore.put("bar9");
+
+ versionTransaction.onabort = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction unexpected aborted");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction complete");
+ continueTest1();
+ database.close();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
+
+function getChecker(event) {
+ debug("ALERT: " + "Value gotten was " + event.target.result);
+}
+
+function continueTest1()
+{
+ var openRequest = window.indexedDB.open("IDBObjectStoreClearDatabase", 1);
+
+ openRequest.onerror = function(event) {
+ debug("ALERT: " + "Request unexpected error - " + event);
+ done();
+ }
+ openRequest.onblocked = function(event) {
+ debug("ALERT: " + "Request unexpected blocked - " + event);
+ done();
+ }
+ openRequest.onupgradeneeded = function(event) {
+ debug("ALERT: " + "Request unexpected upgradeneeded - " + event);
+ done();
+ }
+
+ openRequest.onsuccess = function(event) {
+ debug("ALERT: " + "Success opening database connection - Starting readwrite transaction");
+ var database = event.target.result;
+ var transaction = database.transaction("TestObjectStore", "readwrite");
+ var objectStore = transaction.objectStore("TestObjectStore");
+
+ var request;
+ for (var i = 1; i <= 9; ++i) {
+ request = objectStore.get(i);
+ request.onsuccess = getChecker;
+ }
+
+ request = objectStore.clear();
+ request.onsuccess = function() {
+ debug("ALERT: " + "Object store cleared");
+ var newRequests;
+ for (var i = 1; i <= 9; ++i) {
+ newRequests = objectStore.get(i);
+ newRequests.onsuccess = getChecker;
+ }
+ }
+
+ transaction.onabort = function(event) {
+ debug("ALERT: " + "Readwrite transaction unexpected abort");
+ done();
+ }
+
+ transaction.oncomplete = function(event) {
+ debug("ALERT: " + "Readwrite transaction complete");
+ done();
+ }
+
+ transaction.onerror = function(event) {
+ debug("ALERT: " + "Readwrite transaction unexpected error - " + event);
+ done();
+ }
+ }
+}
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesidbobjectstoreclear2jsfromrev195319trunkLayoutTestsstorageindexeddbmodernidbobjectstoreclear2html"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/idbobjectstore-clear-2.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-clear-2.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/idbobjectstore-clear-2.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/idbobjectstore-clear-2.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,163 @@
</span><ins>+description("This test creates an object store then populates it, then commits that transaction. \
+It then clears it, but aborts that transaction. \
+Finally it checks to make sure everything from step 1 is still in there.");
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+var createRequest = window.indexedDB.open("IDBObjectStoreClear2Database", 1);
+
+createRequest.onupgradeneeded = function(event) {
+ debug("ALERT: " + "Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ var database = event.target.result;
+ var objectStore = database.createObjectStore("TestObjectStore", { autoIncrement: true });
+ var request = objectStore.put("bar1");
+ var request = objectStore.put("bar2");
+ var request = objectStore.put("bar3");
+ var request = objectStore.put("bar4");
+ var request = objectStore.put("bar5");
+ var request = objectStore.put("bar6");
+ var request = objectStore.put("bar7");
+ var request = objectStore.put("bar8");
+ var request = objectStore.put("bar9");
+
+ versionTransaction.onabort = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction unexpected aborted");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction complete");
+ continueTest1();
+ database.close();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
+
+function getChecker(event) {
+ debug("ALERT: " + "Value gotten was " + event.target.result);
+}
+
+function continueTest1()
+{
+ var openRequest = window.indexedDB.open("IDBObjectStoreClear2Database", 1);
+
+ openRequest.onerror = function(event) {
+ debug("ALERT: " + "Request unexpected error - " + event);
+ done();
+ }
+ openRequest.onblocked = function(event) {
+ debug("ALERT: " + "Request unexpected blocked - " + event);
+ done();
+ }
+ openRequest.onupgradeneeded = function(event) {
+ debug("ALERT: " + "Request unexpected upgradeneeded - " + event);
+ done();
+ }
+
+ openRequest.onsuccess = function(event) {
+ debug("ALERT: " + "Success opening database connection - Starting readwrite transaction");
+ var database = event.target.result;
+ var transaction = database.transaction("TestObjectStore", "readwrite");
+ var objectStore = transaction.objectStore("TestObjectStore");
+
+ var request;
+ for (var i = 1; i <= 9; ++i) {
+ request = objectStore.get(i);
+ request.onsuccess = getChecker;
+ }
+
+ request = objectStore.clear();
+ request.onsuccess = function() {
+ debug("ALERT: " + "Object store cleared, making sure its all gone.");
+ var newRequests;
+ for (var i = 1; i <= 9; ++i) {
+ newRequests = objectStore.get(i);
+ newRequests.onsuccess = getChecker;
+ }
+
+ // We'll be on the last request here, can just override it.
+ newRequests.onsuccess = function(event) {
+ getChecker(event);
+ transaction.abort();
+ }
+ }
+
+ // Just for fun clear it twice, won't change anything
+ objectStore.clear();
+
+ transaction.onabort = function(event) {
+ debug("ALERT: " + "Readwrite transaction abort");
+ continueTest2();
+ }
+
+ transaction.oncomplete = function(event) {
+ debug("ALERT: " + "Readwrite transaction unexpected complete");
+ done();
+ }
+
+ transaction.onerror = function(event) {
+ debug("ALERT: " + "Readwrite transaction unexpected error - " + event);
+ done();
+ }
+ }
+}
+
+function continueTest2()
+{
+ var openRequest = window.indexedDB.open("IDBObjectStoreClear2Database", 1);
+
+ openRequest.onerror = function(event) {
+ debug("ALERT: " + "Request unexpected error - " + event);
+ done();
+ }
+ openRequest.onblocked = function(event) {
+ debug("ALERT: " + "Request unexpected blocked - " + event);
+ done();
+ }
+ openRequest.onupgradeneeded = function(event) {
+ debug("ALERT: " + "Request unexpected upgradeneeded - " + event);
+ done();
+ }
+
+ openRequest.onsuccess = function(event) {
+ debug("ALERT: " + "Success opening database connection - Starting final transaction");
+ var database = event.target.result;
+ var transaction = database.transaction("TestObjectStore", "readwrite");
+ var objectStore = transaction.objectStore("TestObjectStore");
+
+ var request;
+ for (var i = 1; i <= 9; ++i) {
+ request = objectStore.get(i);
+ request.onsuccess = getChecker;
+ }
+
+ transaction.onabort = function(event) {
+ debug("ALERT: " + "Readwrite transaction unexpected abort");
+ done();
+ }
+
+ transaction.oncomplete = function(event) {
+ debug("ALERT: " + "Readwrite transaction complete");
+ done();
+ }
+
+ transaction.onerror = function(event) {
+ debug("ALERT: " + "Readwrite transaction unexpected error - " + event);
+ done();
+ }
+ }
+}
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesidbobjectstorecount1jsfromrev195319trunkLayoutTestsstorageindexeddbmodernidbobjectstorecount1html"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/idbobjectstore-count-1.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-count-1.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/idbobjectstore-count-1.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/idbobjectstore-count-1.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,88 @@
</span><ins>+description("This test exercises various uses of IDBObjectStore.count()");
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+var createRequest = window.indexedDB.open("IDBObjectStoreCount1Database", 1);
+var database;
+var objectStore;
+
+function getCount(arg)
+{
+ var request;
+ if (arg == undefined)
+ request = objectStore.count();
+ else
+ request = objectStore.count(arg);
+
+ request.onsuccess = function() {
+ debug("ALERT: " + "Count is: " + request.result);
+ }
+ request.onerror = function(error) {
+ debug("ALERT: " + "Unexpected error getting count: " + error);
+ done();
+ }
+}
+
+function getCounts()
+{
+ getCount();
+ getCount(IDBKeyRange.bound(3, 6));
+ getCount(IDBKeyRange.bound(3, 6, true, false));
+ getCount(IDBKeyRange.bound(3, 6, false, true));
+ getCount(7);
+}
+
+createRequest.onupgradeneeded = function(event) {
+ debug("ALERT: " + "Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ database = event.target.result;
+ objectStore = database.createObjectStore("TestObjectStore");
+
+ objectStore.put(1, 1);
+ getCounts();
+ objectStore.put(2, 2);
+ getCounts();
+ objectStore.put(3, 3);
+ getCounts();
+ objectStore.put(4, 4);
+ getCounts();
+ objectStore.put(5, 5);
+ getCounts();
+ objectStore.put(6, 6);
+ getCounts();
+ objectStore.put(7, 7);
+ getCounts();
+ objectStore.put(8, 8);
+ getCounts();
+ objectStore.put(9, 9);
+ getCounts();
+ objectStore.put(10, 10);
+ getCounts();
+
+ // FIXME: Once objectStore.delete() is implemented, also test counts after deleting previous records.
+
+ versionTransaction.onabort = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction unexpected abort");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction complete");
+ done();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesidbobjectstorecountfailuresjsfromrev195319trunkLayoutTestsstorageindexeddbmodernidbobjectstorecountfailureshtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/idbobjectstore-count-failures.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-count-failures.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/idbobjectstore-count-failures.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/idbobjectstore-count-failures.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,102 @@
</span><ins>+description("This tests some obvious failures that can happen while calling IDBObjectStore.count().");
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+var createRequest = window.indexedDB.open("IDBObjectStoreCountFailuresDatabase", 1);
+var database;
+
+createRequest.onupgradeneeded = function(event) {
+ debug("ALERT: " + "Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ database = event.target.result;
+ var objectStore = database.createObjectStore("TestObjectStore");
+ var request = objectStore.put("bar", "foo");
+
+ request.onsuccess = function() {
+ try {
+ objectStore.count(NaN);
+ } catch(e) {
+ debug("ALERT: " + "Failed to count records in object store with an invalid key");
+ }
+
+ database.deleteObjectStore("TestObjectStore");
+
+ try {
+ objectStore.count();
+ } catch(e) {
+ debug("ALERT: " + "Failed to count records in object store that's been deleted");
+ }
+
+ // Recreate the objectstore because we'll need it in phase 2.
+ var objectStore = database.createObjectStore("TestObjectStore");
+ objectStore.put("bar", "foo");
+ }
+
+ versionTransaction.onabort = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction unexpected aborted");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction complete");
+ continueTest1();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
+
+function continueTest1()
+{
+ var transaction = database.transaction("TestObjectStore", "readonly");
+ var objectStore = transaction.objectStore("TestObjectStore");
+
+ // Spin the transaction with get requests to keep it alive long enough for the setTimeout to fire.
+ var canFinish = false;
+ var spinGet = function() {
+ objectStore.get("foo").onsuccess = function() {
+ if (!canFinish)
+ spinGet();
+ }
+ }
+ spinGet();
+
+ var getWhileInactive = function() {
+ try {
+ objectStore.count();
+ } catch(e) {
+ debug("ALERT: " + "Failed to count records in object store while transaction is inactive");
+ }
+ canFinish = true;
+ }
+
+ setTimeout(getWhileInactive, 0);
+
+ transaction.onabort = function(event) {
+ debug("ALERT: " + "readonly transaction unexpected abort" + event);
+ done();
+ }
+
+ transaction.oncomplete = function(event) {
+ debug("ALERT: " + "readonly transaction complete");
+ done();
+ }
+
+ transaction.onerror = function(event) {
+ debug("ALERT: " + "readonly transaction unexpected error" + event);
+ done();
+ }
+}
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesidbobjectstoredelete1jsfromrev195319trunkLayoutTestsstorageindexeddbmodernidbobjectstoredelete1html"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/idbobjectstore-delete-1.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-delete-1.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/idbobjectstore-delete-1.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/idbobjectstore-delete-1.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,137 @@
</span><ins>+description("This test exercises various uses of IDBObjectStore.delete()");
+
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function log(message)
+{
+ debug(message);
+}
+
+function logCount()
+{
+ var req = objectStore.count();
+ req.onsuccess = function() {
+ debug("Count is " + req.result);
+ }
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+var createRequest = window.indexedDB.open("IDBObjectStoreDelete1Database", 1);
+var database;
+var objectStore;
+
+var date1 = new Date("1999-12-28T23:00:00");
+var date2 = new Date("1999-12-29T23:00:00");
+var date3 = new Date("1999-12-30T23:00:00");
+var date4 = new Date("1999-12-31T23:00:00");
+var date5 = new Date("2000-01-01T00:00:00");
+var date6 = new Date("2000-01-02T00:00:00");
+var date7 = new Date("2000-01-03T00:00:00");
+var date8 = new Date("2000-01-04T00:00:00");
+
+createRequest.onupgradeneeded = function(event) {
+ debug("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ database = event.target.result;
+ objectStore = database.createObjectStore("TestObjectStore");
+
+ // Just for the heck of it.
+ objectStore.delete("foo");
+ objectStore.put("boo", "foo");
+ objectStore.delete("foo");
+
+ objectStore.put("boo", "foo");
+ objectStore.put("bop", "fop");
+ objectStore.put("boq", "foq");
+ objectStore.put("bor", "for");
+ objectStore.put("bos", "fos");
+
+ for (var i = 0; i < 100; ++i)
+ objectStore.put("number " + i, i);
+
+ objectStore.put("date 1", date1);
+ objectStore.put("date 2", date2);
+ objectStore.put("date 3", date3);
+ objectStore.put("date 4", date4);
+ objectStore.put("date 5", date5);
+ objectStore.put("date 6", date6);
+ objectStore.put("date 7", date7);
+ objectStore.put("date 8", date8);
+
+ logCount();
+
+ versionTransaction.onabort = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected abort");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("Initial upgrade versionchange transaction complete");
+ continueTest1();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
+
+function continueTest1()
+{
+ var transaction = database.transaction("TestObjectStore", "readwrite");
+ objectStore = transaction.objectStore("TestObjectStore");
+
+ // The pairs of things in the array are the things to delete followed by the expected decrease in the total count of objects.
+ var thingsToDelete = [
+ date8, 1,
+ date8, 0,
+ "balyhoo", 0,
+ IDBKeyRange.bound(date6, date7, true, true), 0,
+ IDBKeyRange.bound(date6, date7, true), 1,
+ IDBKeyRange.bound(date5, date6, false, true), 1,
+ IDBKeyRange.bound(date1, date6), 5,
+ IDBKeyRange.bound(1, 98), 98,
+ IDBKeyRange.bound("foo", "fos", true, true), 3
+ ];
+ var currentThing = 0;
+
+ var runDeleteTests = function()
+ {
+ if (!thingsToDelete[currentThing])
+ return;
+
+ objectStore.delete(thingsToDelete[currentThing]).onsuccess = function() {
+ debug("Deleted \"" + thingsToDelete[currentThing] + "\", and there should now be " + thingsToDelete[currentThing + 1] + " less things total.");
+ logCount();
+ currentThing += 2;
+ runDeleteTests();
+ }
+ }
+ runDeleteTests();
+
+ transaction.onabort = function(event) {
+ debug("readwrite transaction unexpected abort" + event);
+ done();
+ }
+
+ transaction.oncomplete = function(event) {
+ debug("readwrite transaction complete");
+ done();
+ }
+
+ transaction.onerror = function(event) {
+ debug("readwrite transaction unexpected error" + event);
+ done();
+ }
+}
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesidbobjectstoredelete2jsfromrev195319trunkLayoutTestsstorageindexeddbmodernidbobjectstoredelete2html"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/idbobjectstore-delete-2.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-delete-2.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/idbobjectstore-delete-2.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/idbobjectstore-delete-2.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,111 @@
</span><ins>+description("This test exercises IDBObjectStore.delete() followed by an abort to make sure the delete is un-done.");
+
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function log(message)
+{
+ debug(message);
+}
+
+function logCount()
+{
+ var req = objectStore.count();
+ req.onsuccess = function() {
+ debug("Count is " + req.result);
+ }
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+var createRequest = window.indexedDB.open("IDBObjectStoreDelete2Database", 1);
+var database;
+
+createRequest.onupgradeneeded = function(event) {
+ debug("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ database = event.target.result;
+ database.createObjectStore("TestObjectStore").put("bar", "foo");
+
+ versionTransaction.onabort = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected abort");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("Initial upgrade versionchange transaction complete");
+ continueTest1();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
+
+function continueTest1()
+{
+ var transaction = database.transaction("TestObjectStore", "readwrite");
+ transaction.objectStore("TestObjectStore").delete("foo").onsuccess = function()
+ {
+ var request = transaction.objectStore("TestObjectStore").get("foo");
+ request.onsuccess = function()
+ {
+ debug("After delete, record for \"foo\" has value: " + request.result);
+ transaction.abort();
+ }
+ }
+
+ transaction.onabort = function(event) {
+ debug("readwrite transaction aborted");
+ continueTest2();
+ }
+
+ transaction.oncomplete = function(event) {
+ debug("readwrite transaction unexpected complete");
+ done();
+ }
+
+ transaction.onerror = function(event) {
+ debug("readwrite transaction unexpected error");
+ done();
+ }
+}
+
+function continueTest2()
+{
+ var transaction = database.transaction("TestObjectStore", "readonly");
+
+ var request = transaction.objectStore("TestObjectStore").get("foo");
+ request.onsuccess = function()
+ {
+ debug("Record for \"foo\" has final value: " + request.result);
+ }
+
+ transaction.onabort = function(event)
+ {
+ debug("readonly transaction unexpected abort");
+ done();
+ }
+
+ transaction.oncomplete = function(event)
+ {
+ debug("readonly transaction complete");
+ done();
+ }
+
+ transaction.onerror = function(event)
+ {
+ debug("readonly transaction unexpected error");
+ done();
+ }
+}
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesidbobjectstoredeletefailuresjsfromrev195319trunkLayoutTestsstorageindexeddbmodernidbobjectstoredeletefailureshtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/idbobjectstore-delete-failures.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-delete-failures.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/idbobjectstore-delete-failures.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/idbobjectstore-delete-failures.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,117 @@
</span><ins>+description("This tests some obvious failures that can happen while calling IDBObjectStore.delete().");
+
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function log(message)
+{
+ debug(message);
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+var createRequest = window.indexedDB.open("IDBObjectStoreDeleteFailuresDatabase", 1);
+var database;
+
+createRequest.onupgradeneeded = function(event) {
+ debug("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ database = event.target.result;
+ var objectStore = database.createObjectStore("TestObjectStore");
+ var request = objectStore.put("bar", "foo");
+
+ request.onsuccess = function() {
+ try {
+ objectStore.delete(NaN);
+ } catch(e) {
+ debug("Failed to delete record from object store with an invalid key");
+ }
+
+ database.deleteObjectStore("TestObjectStore");
+
+ try {
+ objectStore.delete("foo");
+ } catch(e) {
+ debug("Failed to delete record from object store that has been deleted");
+ }
+
+ // Recreate the objectstore because we'll need it in phase 2.
+ var objectStore = database.createObjectStore("TestObjectStore");
+ objectStore.put("bar", "foo");
+ }
+
+ versionTransaction.onabort = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected aborted");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("Initial upgrade versionchange transaction complete");
+ continueTest1();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
+
+function continueTest1()
+{
+ var transaction = database.transaction("TestObjectStore", "readonly");
+ var objectStore = transaction.objectStore("TestObjectStore");
+
+ try {
+ objectStore.delete("foo");
+ } catch(e) {
+ debug("Failed to delete a record in read-only transaction");
+ }
+
+ var transaction = database.transaction("TestObjectStore", "readwrite");
+ var objectStore = transaction.objectStore("TestObjectStore");
+
+ // Spin the transaction with get requests to keep it alive long enough for the setTimeout to fire.
+ var canFinish = false;
+ var spinGet = function() {
+ objectStore.get("foo").onsuccess = function() {
+ if (!canFinish)
+ spinGet();
+ }
+ }
+ spinGet();
+
+ var testWhileInactive = function() {
+ try {
+ objectStore.delete("foo");
+ } catch(e) {
+ debug("Failed to delete record with inactive transaction");
+ }
+ canFinish = true;
+ }
+
+ setTimeout(testWhileInactive, 0);
+
+ transaction.onabort = function(event) {
+ debug("readwrite transaction unexpected abort" + event);
+ done();
+ }
+
+ transaction.oncomplete = function(event) {
+ debug("readwrite transaction complete");
+ done();
+ }
+
+ transaction.onerror = function(event) {
+ debug("readwrite transaction unexpected error" + event);
+ done();
+ }
+}
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesidbobjectstoregetfailuresjsfromrev195319trunkLayoutTestsstorageindexeddbmodernidbobjectstoregetfailureshtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/idbobjectstore-get-failures.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-get-failures.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/idbobjectstore-get-failures.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/idbobjectstore-get-failures.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,102 @@
</span><ins>+description("This tests some obvious failures that can happen while calling IDBObjectStore.get().");
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+var createRequest = window.indexedDB.open("IDBObjectStoreGetFailuresDatabase", 1);
+var database;
+
+createRequest.onupgradeneeded = function(event) {
+ debug("ALERT: " + "Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ database = event.target.result;
+ var objectStore = database.createObjectStore("TestObjectStore");
+ var request = objectStore.put("bar", "foo");
+
+ request.onsuccess = function() {
+ try {
+ objectStore.get(NaN);
+ } catch(e) {
+ debug("ALERT: " + "Failed to get record from object store with an invalid key");
+ }
+
+ database.deleteObjectStore("TestObjectStore");
+
+ try {
+ objectStore.get("foo");
+ } catch(e) {
+ debug("ALERT: " + "Failed to get record from object store that has been deleted");
+ }
+
+ // Recreate the objectstore because we'll need it in phase 2.
+ var objectStore = database.createObjectStore("TestObjectStore");
+ objectStore.put("bar", "foo");
+ }
+
+ versionTransaction.onabort = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction unexpected aborted");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction complete");
+ continueTest1();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
+
+function continueTest1()
+{
+ var transaction = database.transaction("TestObjectStore", "readonly");
+ var objectStore = transaction.objectStore("TestObjectStore");
+
+ // Spin the transaction with get requests to keep it alive long enough for the setTimeout to fire.
+ var canFinish = false;
+ var spinGet = function() {
+ objectStore.get("foo").onsuccess = function() {
+ if (!canFinish)
+ spinGet();
+ }
+ }
+ spinGet();
+
+ var getWhileInactive = function() {
+ try {
+ objectStore.get("foo");
+ } catch(e) {
+ debug("ALERT: " + "Failed to get record from object store while the transaction is inactive");
+ }
+ canFinish = true;
+ }
+
+ setTimeout(getWhileInactive, 0);
+
+ transaction.onabort = function(event) {
+ debug("ALERT: " + "readonly transaction unexpected abort" + event);
+ done();
+ }
+
+ transaction.oncomplete = function(event) {
+ debug("ALERT: " + "readonly transaction complete");
+ done();
+ }
+
+ transaction.onerror = function(event) {
+ debug("ALERT: " + "readonly transaction unexpected error" + event);
+ done();
+ }
+}
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesidbobjectstoreputandclearfailuresjsfromrev195319trunkLayoutTestsstorageindexeddbmodernidbobjectstoreputandclearfailureshtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/idbobjectstore-put-and-clear-failures.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/idbobjectstore-put-and-clear-failures.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/idbobjectstore-put-and-clear-failures.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/idbobjectstore-put-and-clear-failures.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,124 @@
</span><ins>+description("This tests some obvious failures that can happen while calling IDBObjectStore.put() and IDBObjectStore.clear().");
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+var createRequest = window.indexedDB.open("IDBObjectStorePutAndClearFailuresDatabase", 1);
+var database;
+
+createRequest.onupgradeneeded = function(event) {
+ debug("ALERT: " + "Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ database = event.target.result;
+ var objectStore = database.createObjectStore("TestObjectStore");
+ var request = objectStore.put("bar", "foo");
+
+ request.onsuccess = function() {
+ try {
+ objectStore.put("bar", NaN);
+ } catch(e) {
+ debug("ALERT: " + "Failed to put record into object store with an invalid key");
+ }
+
+ database.deleteObjectStore("TestObjectStore");
+
+ try {
+ objectStore.put("bar", "foo");
+ } catch(e) {
+ debug("ALERT: " + "Failed to put record into object store that has been deleted");
+ }
+
+ try {
+ objectStore.clear();
+ } catch(e) {
+ debug("ALERT: " + "Failed to clear object store that has been deleted");
+ }
+
+ // Recreate the objectstore because we'll need it in phase 2.
+ var objectStore = database.createObjectStore("TestObjectStore");
+ objectStore.put("bar", "foo");
+ }
+
+ versionTransaction.onabort = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction unexpected aborted");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction complete");
+ continueTest1();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
+
+function continueTest1()
+{
+ var transaction = database.transaction("TestObjectStore", "readonly");
+ var objectStore = transaction.objectStore("TestObjectStore");
+
+ try {
+ objectStore.clear();
+ } catch(e) {
+ debug("ALERT: " + "Failed to clear object store in read-only transaction");
+ }
+
+ var transaction = database.transaction("TestObjectStore", "readwrite");
+ var objectStore = transaction.objectStore("TestObjectStore");
+
+ // Spin the transaction with get requests to keep it alive long enough for the setTimeout to fire.
+ var canFinish = false;
+ var spinGet = function() {
+ objectStore.get("foo").onsuccess = function() {
+ if (!canFinish)
+ spinGet();
+ }
+ }
+ spinGet();
+
+ var testWhileInactive = function() {
+ try {
+ objectStore.put("bar", "foo");
+ } catch(e) {
+ debug("ALERT: " + "Failed to put record into object store with inactive transaction");
+ }
+
+ try {
+ objectStore.clear();
+ } catch(e) {
+ debug("ALERT: " + "Failed to clear object store with inactive transaction");
+ }
+
+ canFinish = true;
+ }
+
+ setTimeout(testWhileInactive, 0);
+
+ transaction.onabort = function(event) {
+ debug("ALERT: " + "readwrite transaction unexpected abort" + event);
+ done();
+ }
+
+ transaction.oncomplete = function(event) {
+ debug("ALERT: " + "readwrite transaction complete");
+ done();
+ }
+
+ transaction.onerror = function(event) {
+ debug("ALERT: " + "readwrite transaction unexpected error" + event);
+ done();
+ }
+}
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesidbtransactionobjectstorefailuresjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/modern/resources/idbtransaction-objectstore-failures.js (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/idbtransaction-objectstore-failures.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/idbtransaction-objectstore-failures.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,76 @@
</span><ins>+description("This tests some obvious failures that can happen while calling transaction.objectStore()");
+
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+var request = window.indexedDB.open("TransactionObjectStoreFailuresTestDatabase");
+
+function done()
+{
+ finishJSTest();
+}
+
+request.onupgradeneeded = function(event)
+{
+ debug("ALERT: " + "Upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var tx = request.transaction;
+ var db = event.target.result;
+
+ debug("ALERT: " + tx + " - " + tx.mode);
+ debug("ALERT: " + db);
+
+ var os1 = db.createObjectStore("TestObjectStore1");
+ var os2 = db.createObjectStore("TestObjectStore2");
+
+ var putRequest = os1.put("bar", "foo");
+
+ putRequest.onerror = function() {
+ debug("ALERT: " + "put failed (because transaction was aborted)");
+ }
+
+ try {
+ tx.objectStore("");
+ } catch(e) {
+ debug("ALERT: " + "Caught attempt to access empty-named object store on the transaction");
+ }
+
+ try {
+ tx.objectStore();
+ } catch(e) {
+ debug("ALERT: " + "Caught attempt to access null-named object store on the transaction");
+ }
+
+ try {
+ tx.objectStore("ThisObjectStoreDoesNotExist");
+ } catch(e) {
+ debug("ALERT: " + "Caught attempt to access non-existant object store on the transaction");
+ }
+
+ tx.abort();
+
+ try {
+ tx.objectStore("TestObjectStore1");
+ } catch(e) {
+ debug("ALERT: " + "Caught attempt to access valid object store on a transaction that is already finishing");
+ }
+
+ tx.onabort = function(event) {
+ debug("ALERT: " + "First version change transaction abort");
+ done();
+ }
+
+ tx.oncomplete = function(event) {
+ debug("ALERT: " + "First version change transaction unexpected complete");
+ done();
+ }
+
+ tx.onerror = function(event) {
+ debug("ALERT: " + "First version change transaction unexpected error - " + event);
+ done();
+ }
+}
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesindex1jsfromrev195319trunkLayoutTestsstorageindexeddbmodernindex1html"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/index-1.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/index-1.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/index-1.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/index-1.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,101 @@
</span><ins>+description("This tests the expected values from some more complex index situations.");
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+function log(message)
+{
+ debug(message);
+}
+
+var createRequest = window.indexedDB.open("Index1Database", 1);
+
+function checkKey(index, key)
+{
+ var request1 = index.get(key);
+ var request2 = index.getKey(key);
+
+ request1.onsuccess = function() {
+ debug("get \"" + key + "\" result is: " + request1.result);
+ for (n in request1.result)
+ debug(n + " is " + request1.result[n]);
+ }
+ request2.onsuccess = function() {
+ debug("getKey \"" + key + "\" result is: " + request2.result);
+ for (n in request2.result)
+ debug(n + " is " + request2.result[n]);
+ }
+}
+
+function checkIndex(index)
+{
+ checkKey(index, "good");
+ checkKey(index, "bad");
+ checkKey(index, "ok");
+ checkKey(index, "meh");
+ checkKey(index, "super");
+ checkKey(index, "thanksForAsking");
+ checkKey(index, [ "good", "bad" ]);
+ checkKey(index, [ "ok", "meh" ]);
+ checkKey(index, [ "super", "thanksForAsking" ]);
+ checkKey(index, "This is to test");
+ checkKey(index, "multiEntry indexes");
+ checkKey(index, ["This is to test", "multiEntry indexes" ]);
+
+ var request = index.count();
+ request.onsuccess = function() {
+ debug("count result is: " + request.result);
+ debug("");
+ }
+}
+
+createRequest.onupgradeneeded = function(event) {
+ debug("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ var database = event.target.result;
+ var objectStore = database.createObjectStore("TestObjectStore");
+ var index1 = objectStore.createIndex("TestIndex1", "bar");
+ var index2 = objectStore.createIndex("TestIndex2", "baz");
+ var index3 = objectStore.createIndex("TestIndex3", [ "bar", "baz" ]);
+ var index4 = objectStore.createIndex("TestIndex4", "bar", { multiEntry: true });
+
+ objectStore.put({ bar: "good", baz: "bad" }, 1);
+ objectStore.put({ bar: "good", baz: "bad" }, 2);
+ objectStore.put({ bar: "good", baz: "bad" }, 3);
+ objectStore.put({ bar: "ok", baz: "meh" }, 4);
+ objectStore.put({ bar: "ok", baz: "meh" }, 5);
+ objectStore.put({ bar: "ok", baz: "meh" }, 6);
+ objectStore.put({ bar: "super", baz: "thanksForAsking" }, 7);
+ objectStore.put({ bar: "super", baz: "thanksForAsking" }, 8);
+ objectStore.put({ bar: "super", baz: "thanksForAsking" }, 9);
+ objectStore.put({ bar: [ "This is to test", "multiEntry indexes" ]}, 10);
+
+ checkIndex(index1);
+ checkIndex(index2);
+ checkIndex(index3);
+ checkIndex(index4);
+
+ versionTransaction.onabort = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected aborted");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("Initial upgrade versionchange transaction complete");
+ done();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesindex2jsfromrev195319trunkLayoutTestsstorageindexeddbmodernindex2html"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/index-2.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/index-2.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/index-2.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/index-2.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,160 @@
</span><ins>+description("This tests indexes are left in appropriate states after aborted transactions.");
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+function log(message)
+{
+ debug(message);
+}
+
+var createRequest = window.indexedDB.open("Index2Database", 1);
+
+function checkKey(index, key)
+{
+ var request1 = index.get(key);
+ var request2 = index.getKey(key);
+
+ request1.onsuccess = function() {
+ debug("get \"" + key + "\" result is: " + request1.result);
+ for (n in request1.result)
+ debug(n + " is " + request1.result[n]);
+ }
+ request2.onsuccess = function() {
+ debug("getKey \"" + key + "\" result is: " + request2.result);
+ for (n in request2.result)
+ debug(n + " is " + request2.result[n]);
+ }
+}
+
+function checkIndex(index)
+{
+ checkKey(index, "good");
+ checkKey(index, "bad");
+ checkKey(index, "multiEntry");
+ checkKey(index, "test");
+
+ var request = index.count();
+ request.onsuccess = function() {
+ debug("count result is: " + request.result);
+ debug("");
+ }
+}
+
+var database;
+
+createRequest.onupgradeneeded = function(event) {
+ debug("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ database = event.target.result;
+ var objectStore = database.createObjectStore("TestObjectStore");
+ var index1 = objectStore.createIndex("TestIndex1", "bar");
+ var index2 = objectStore.createIndex("TestIndex2", "baz");
+ var index3 = objectStore.createIndex("TestIndex3", "bar", { multiEntry: true });
+
+ objectStore.put({ bar: "good", baz: "bad" }, 1);
+ objectStore.put({ bar: [ "multiEntry", "test" ]}, 2);
+
+ checkIndex(index1);
+ checkIndex(index2);
+ checkIndex(index3);
+
+ versionTransaction.onabort = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected abort");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("Initial upgrade versionchange transaction complete");
+ continueTest1();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
+
+function continueTest1()
+{
+ var transaction = database.transaction("TestObjectStore", "readwrite");
+ var objectStore = transaction.objectStore("TestObjectStore");
+ var index1 = objectStore.index("TestIndex1");
+ var index2 = objectStore.index("TestIndex2");
+ var index3 = objectStore.index("TestIndex3");
+
+ objectStore.delete(1).onsuccess = function() {
+ debug("Deleted key 1 from objectstore");
+ debug("");
+ }
+
+ checkIndex(index1);
+ checkIndex(index2);
+ checkIndex(index3);
+
+ objectStore.clear().onsuccess = function() {
+ debug("Cleared objectstore");
+ debug("");
+ }
+
+ checkIndex(index1);
+ checkIndex(index2);
+ checkIndex(index3);
+
+ objectStore.get(0).onsuccess = function() {
+ debug("All done. Moving on to final part");
+ transaction.abort();
+ }
+
+ transaction.onabort = function(event) {
+ debug("readwrite transaction aborted");
+ continueTest2();
+ }
+
+ transaction.oncomplete = function(event) {
+ debug("readwrite transaction unexpected complete");
+ done();
+ }
+
+ transaction.onerror = function(event) {
+ debug("readwrite transaction unexpected error");
+ done();
+ }
+}
+
+function continueTest2()
+{
+ var transaction = database.transaction("TestObjectStore", "readonly");
+ var objectStore = transaction.objectStore("TestObjectStore");
+ var index1 = objectStore.index("TestIndex1");
+ var index2 = objectStore.index("TestIndex2");
+ var index3 = objectStore.index("TestIndex3");
+
+ checkIndex(index1);
+ checkIndex(index2);
+ checkIndex(index3);
+
+ transaction.onabort = function(event) {
+ debug("readwrite transaction unexpected abort");
+ done();
+ }
+
+ transaction.oncomplete = function(event) {
+ debug("readwrite transaction complete");
+ done();
+ }
+
+ transaction.onerror = function(event) {
+ debug("readwrite transaction unexpected error");
+ done();
+ }
+}
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesindex3jsfromrev195319trunkLayoutTestsstorageindexeddbmodernindex3html"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/index-3.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/index-3.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/index-3.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/index-3.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,112 @@
</span><ins>+description("This test exercises the \"unique\" constraint of indexes.");
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+function log(message)
+{
+ debug(message);
+}
+
+var createRequest = window.indexedDB.open("Index3Database", 1);
+var objectStore;
+
+function checkObjectStore()
+{
+ var req1 = objectStore.get(1);
+ req1.onsuccess = function() {
+ debug("Value of 1 is: " + req1.result);
+ }
+ var req2 = objectStore.get(2);
+ req2.onsuccess = function() {
+ debug("Value of 2 is: " + req2.result);
+ }
+ var req3 = objectStore.get(3);
+ req3.onsuccess = function() {
+ debug("Value of 3 is: " + req3.result);
+ }
+}
+
+function checkIndex(index, name)
+{
+ var req = index.count();
+ req.onsuccess = function() {
+ debug("Count in index " + name + " is: " + req.result);
+ }
+}
+
+createRequest.onupgradeneeded = function(event) {
+ debug("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ var database = event.target.result;
+ objectStore = database.createObjectStore("TestObjectStore");
+ var i1 = objectStore.createIndex("TestIndex1", "bar", { unique: true });
+ var i2 = objectStore.createIndex("TestIndex2", "bar", { multiEntry: true, unique: true });
+
+ var request1 = objectStore.put({ bar: "good", baz: "bad" }, 1);
+ request1.onsuccess = function() {
+ debug("First put success");
+ }
+ request1.onerror = function() {
+ debug("First put unexpected failure");
+ done();
+ }
+
+ checkObjectStore();
+ checkIndex(i1, 1);
+ checkIndex(i2, 2);
+
+ var request2 = objectStore.put({ bar: "good", baz: "bad" }, 2);
+ request2.onsuccess = function() {
+ debug("Second put unexpected success");
+ done();
+ }
+ request2.onerror = function(e) {
+ debug("Second put failure");
+ e.stopPropagation();
+ e.preventDefault();
+ }
+
+ checkObjectStore();
+ checkIndex(i1, 1);
+ checkIndex(i2, 2);
+
+ var request3 = objectStore.put({ bar: [ "gnarly", "great", "good" ]}, 3);
+ request3.onsuccess = function() {
+ debug("Third put unexpected success");
+ done();
+ }
+ request3.onerror = function(e) {
+ debug("Third put failure");
+ e.stopPropagation();
+ e.preventDefault();
+ }
+
+ checkObjectStore();
+ checkIndex(i1, 1);
+ checkIndex(i2, 2);
+
+ versionTransaction.onabort = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected aborted");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("Initial upgrade versionchange transaction complete");
+ done();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesindex4jsfromrev195319trunkLayoutTestsstorageindexeddbmodernindex4html"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/index-4.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/index-4.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/index-4.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/index-4.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,92 @@
</span><ins>+description("This tests that indexes added to an object store with existing records are populated upon their creation.");
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+function log(message)
+{
+ debug(message);
+}
+
+var index;
+var objectStore;
+
+function checkIndexValues()
+{
+ var countRequest = index.count();
+ countRequest.onsuccess = function() {
+ debug("Count is: " + countRequest.result);
+ }
+
+ var cursorRequest = index.openCursor();
+ cursorRequest.onsuccess = function() {
+ var cursor = cursorRequest.result;
+ if (!cursor) {
+ done();
+ return;
+ }
+ debug("Cursor at record: " + cursor.key + " / " + cursor.primaryKey);
+ cursor.continue();
+
+ }
+ cursorRequest.onerror = function(e) {
+ debug("Unexpected error opening or iterating cursor");
+ logCursor(cursorRequest.result);
+ done();
+ }
+}
+
+var createRequest = window.indexedDB.open("Index4Database", 1);
+createRequest.onupgradeneeded = function(event) {
+ debug("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ var database = event.target.result;
+ objectStore = database.createObjectStore("TestObjectStore");
+ objectStore.put({ bar: "A" }, 1);
+ objectStore.put({ bar: "A" }, 2);
+ objectStore.put({ bar: "B" }, 3);
+ objectStore.put({ bar: "B" }, 4);
+ objectStore.put({ bar: "C" }, 5);
+ objectStore.put({ bar: "C" }, 6);
+ objectStore.put({ bar: "D" }, 7);
+ objectStore.put({ bar: "D" }, 8);
+ objectStore.put({ bar: "E" }, 9);
+ objectStore.put({ bar: "E" }, 10);
+ objectStore.put({ bar: "F" }, 11);
+ objectStore.put({ bar: "F" }, 12);
+ objectStore.put({ bar: "G" }, 13);
+ objectStore.put({ bar: "G" }, 14);
+ objectStore.put({ bar: "H" }, 15);
+ objectStore.put({ bar: "H" }, 16);
+ objectStore.put({ bar: "I" }, 17);
+ objectStore.put({ bar: "I" }, 18);
+
+ // This index should be populated with the above values upon its creation.
+ index = objectStore.createIndex("TestIndex1", "bar");
+
+ checkIndexValues();
+
+ versionTransaction.onabort = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected aborted");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("Initial upgrade versionchange transaction complete");
+ done();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesindex5jsfromrev195319trunkLayoutTestsstorageindexeddbmodernindex5html"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/index-5.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/index-5.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/index-5.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/index-5.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,79 @@
</span><ins>+description("This tests creating an index on an object store that already has records, and those records would violate the unique constraint of the index. (The index creation should fail).");
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+function log(message)
+{
+ debug(message);
+}
+
+var index;
+var objectStore;
+
+function checkIndexValues()
+{
+ var countRequest = index.count();
+ countRequest.onsuccess = function() {
+ debug("Count is: " + countRequest.result);
+ }
+ countRequest.onerror = function(e) {
+ debug("Error getting cursor count");
+ e.stopPropagation();
+ }
+
+ var cursorRequest = index.openCursor();
+ cursorRequest.onsuccess = function() {
+ var cursor = cursorRequest.result;
+ debug("Cursor at record: " + cursor.key + " / " + cursor.primaryKey);
+
+ if (cursor.key != undefined)
+ cursor.continue();
+ else
+ done();
+ }
+ cursorRequest.onerror = function(e) {
+ debug("Error opening or iterating cursor");
+ e.stopPropagation();
+ }
+}
+
+var createRequest = window.indexedDB.open("Index5Database", 1);
+createRequest.onupgradeneeded = function(event) {
+ debug("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ var database = event.target.result;
+ objectStore = database.createObjectStore("TestObjectStore");
+ objectStore.put({ bar: "A" }, 1);
+ objectStore.put({ bar: "A" }, 2);
+
+ // This index should be populated with the above values upon its creation, but that should fail because
+ // of constraint violations.
+ index = objectStore.createIndex("TestIndex1", "bar", { unique: true });
+
+ checkIndexValues();
+
+ versionTransaction.onabort = function(event) {
+ debug("Initial upgrade versionchange transaction aborted (expected because index creation failed, and that should've caused transaction abort)");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected complete");
+ done();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesindexcursor1jsfromrev195319trunkLayoutTestsstorageindexeddbmodernindexcursor1html"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/index-cursor-1.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/index-cursor-1.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/index-cursor-1.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/index-cursor-1.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,129 @@
</span><ins>+description("This tests cursors that iterate over entire indexes.");
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+function log(message)
+{
+ debug(message);
+}
+
+function logCursor(cursor)
+{
+ debug("Cursor direction is: " + cursor.direction);
+ debug("Cursor source is: " + cursor.source.name);
+ debug("Cursor key is: " + cursor.key);
+ debug("Cursor primary key is: " + cursor.primaryKey);
+ debug("Cursor value is: " + cursor.value);
+}
+
+function setupRequest(request)
+{
+ request.onsuccess = function() {
+ if (!request.result) {
+ startNextCursor();
+ return;
+ }
+ debug("Success opening or iterating cursor");
+ logCursor(request.result);
+ request.result.continue();
+ }
+ request.onerror = function(e) {
+ debug("Unexpected error opening or iterating cursor");
+ logCursor(request.result);
+ done();
+ }
+}
+
+function testCursorDirection(index, direction)
+{
+ var range = IDBKeyRange.lowerBound(-Infinity);
+ var request = index.openCursor(range, direction);
+ setupRequest(request);
+}
+
+var index1;
+var index2;
+
+var cursorCommands = [
+ "testCursorDirection(index2, 'prevunique')",
+ "testCursorDirection(index1, 'prevunique')",
+ "testCursorDirection(index2, 'prev')",
+ "testCursorDirection(index1, 'prev')",
+ "testCursorDirection(index2, 'nextunique')",
+ "testCursorDirection(index1, 'nextunique')",
+ "testCursorDirection(index2, 'next')",
+ "testCursorDirection(index1, 'next')",
+];
+
+function startNextCursor()
+{
+ if (!cursorCommands.length) {
+ done();
+ return;
+ }
+
+ var command = cursorCommands.pop();
+ log ("");
+ debug("Starting a new cursor: " + command);
+ eval(command);
+}
+
+var createRequest = window.indexedDB.open("IndexCursor1Database", 1);
+createRequest.onupgradeneeded = function(event) {
+ debug("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ var database = event.target.result;
+ var objectStore = database.createObjectStore("TestObjectStore");
+ index1 = objectStore.createIndex("TestIndex1", "bar");
+ index2 = objectStore.createIndex("TestIndex2", "baz");
+
+ objectStore.put({ bar: "A", baz: "a" }, 1);
+ objectStore.put({ bar: "A", baz: "a" }, 3);
+ objectStore.put({ bar: "A", baz: "a" }, 2);
+ objectStore.put({ bar: "B", baz: "b" }, 5);
+ objectStore.put({ bar: "B", baz: "b" }, 6);
+ objectStore.put({ bar: "B", baz: "b" }, 4);
+ objectStore.put({ bar: "C", baz: "c" }, 7);
+ objectStore.put({ bar: "C", baz: "c" }, 9);
+ objectStore.put({ bar: "C", baz: "c" }, 8);
+ objectStore.put({ bar: "D", baz: "d" }, 11);
+ objectStore.put({ bar: "D", baz: "d" }, 12);
+ objectStore.put({ bar: "D", baz: "d" }, 10);
+
+ var req1 = index1.count();
+ req1.onsuccess = function() {
+ debug("TestIndex1 count is: " + req1.result);
+ }
+
+ var req2 = index2.count();
+ req2.onsuccess = function() {
+ debug("TestIndex2 count is: " + req2.result);
+ }
+
+ startNextCursor();
+
+ versionTransaction.onabort = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected aborted");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("Initial upgrade versionchange transaction complete");
+ done();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesindexcursor2jsfromrev195319trunkLayoutTestsstorageindexeddbmodernindexcursor2html"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/index-cursor-2.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/index-cursor-2.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/index-cursor-2.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/index-cursor-2.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,133 @@
</span><ins>+description("This tests cursors that iterate over parts of indexes.");
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+function log(message)
+{
+ debug(message);
+}
+
+function logCursor(cursor)
+{
+ debug("Cursor direction is: " + cursor.direction);
+ debug("Cursor source is: " + cursor.source.name);
+ debug("Cursor key is: " + cursor.key);
+ debug("Cursor primary key is: " + cursor.primaryKey);
+ debug("Cursor value is: " + cursor.value);
+}
+
+function setupRequest(request)
+{
+ request.onsuccess = function() {
+ if (!request.result) {
+ startNextCursor();
+ return;
+ }
+ debug("Success opening or iterating cursor");
+ logCursor(request.result);
+ request.result.continue();
+ }
+ request.onerror = function(e) {
+ debug("Unexpected error opening or iterating cursor");
+ logCursor(request.result);
+ done();
+ }
+}
+
+var index;
+
+function testCursorDirection(direction, range)
+{
+ var request = index.openCursor(range, direction);
+ setupRequest(request);
+}
+
+var cursorCommands = [
+ "testCursorDirection('prevunique', IDBKeyRange.only('B'))",
+ "testCursorDirection('prev', IDBKeyRange.only('B'))",
+ "testCursorDirection('nextunique', IDBKeyRange.only('B'))",
+ "testCursorDirection('next', IDBKeyRange.only('B'))",
+ "testCursorDirection('prevunique', IDBKeyRange.lowerBound('C'))",
+ "testCursorDirection('prev', IDBKeyRange.lowerBound('C'))",
+ "testCursorDirection('nextunique', IDBKeyRange.lowerBound('C'))",
+ "testCursorDirection('next', IDBKeyRange.lowerBound('C'))",
+ "testCursorDirection('prevunique', IDBKeyRange.upperBound('B'))",
+ "testCursorDirection('prev', IDBKeyRange.upperBound('B'))",
+ "testCursorDirection('nextunique', IDBKeyRange.upperBound('B'))",
+ "testCursorDirection('next', IDBKeyRange.upperBound('B'))",
+ "testCursorDirection('prevunique', IDBKeyRange.bound('B', 'C'))",
+ "testCursorDirection('prev', IDBKeyRange.bound('B', 'C'))",
+ "testCursorDirection('nextunique', IDBKeyRange.bound('B', 'C'))",
+ "testCursorDirection('next', IDBKeyRange.bound('B', 'C'))",
+ "testCursorDirection('prevunique', IDBKeyRange.bound('B', 'D', true, true))",
+ "testCursorDirection('prev', IDBKeyRange.bound('B', 'D', true, true))",
+ "testCursorDirection('nextunique', IDBKeyRange.bound('B', 'D', true, true))",
+ "testCursorDirection('next', IDBKeyRange.bound('B', 'D', true, true))",
+];
+
+function startNextCursor()
+{
+ if (!cursorCommands.length) {
+ done();
+ return;
+ }
+
+ var command = cursorCommands.pop();
+ log ("");
+ debug("Starting a new cursor: " + command);
+ eval(command);
+}
+
+var createRequest = window.indexedDB.open("IndexCursor2Database", 1);
+createRequest.onupgradeneeded = function(event) {
+ debug("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ var database = event.target.result;
+ var objectStore = database.createObjectStore("TestObjectStore");
+ index = objectStore.createIndex("TestIndex1", "bar");
+
+ objectStore.put({ bar: "A", baz: "a" }, 1);
+ objectStore.put({ bar: "A", baz: "a" }, 3);
+ objectStore.put({ bar: "A", baz: "a" }, 2);
+ objectStore.put({ bar: "B", baz: "b" }, 5);
+ objectStore.put({ bar: "B", baz: "b" }, 6);
+ objectStore.put({ bar: "B", baz: "b" }, 4);
+ objectStore.put({ bar: "C", baz: "c" }, 7);
+ objectStore.put({ bar: "C", baz: "c" }, 9);
+ objectStore.put({ bar: "C", baz: "c" }, 8);
+ objectStore.put({ bar: "D", baz: "d" }, 11);
+ objectStore.put({ bar: "D", baz: "d" }, 12);
+ objectStore.put({ bar: "D", baz: "d" }, 10);
+
+ var req = index.count();
+ req.onsuccess = function() {
+ debug("TestIndex1 count is: " + req.result);
+ }
+
+ startNextCursor();
+
+ versionTransaction.onabort = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected aborted");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("Initial upgrade versionchange transaction complete");
+ done();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesindexcursor3jsfromrev195319trunkLayoutTestsstorageindexeddbmodernindexcursor3html"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/index-cursor-3.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/index-cursor-3.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/index-cursor-3.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/index-cursor-3.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,172 @@
</span><ins>+description("This tests that index cursors properly handle changing indexes.");
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+function log(message)
+{
+ debug(message);
+}
+
+var index;
+var objectStore;
+
+function logCursor(cursor)
+{
+ debug("Cursor direction is: " + cursor.direction);
+ debug("Cursor source is: " + cursor.source.name);
+ debug("Cursor key is: " + cursor.key);
+ debug("Cursor primary key is: " + cursor.primaryKey);
+ debug("Cursor value is: " + cursor.value);
+}
+
+function setupRequest(request)
+{
+ request.onsuccess = function() {
+ debug("Success opening or iterating cursor");
+ if (request.result)
+ logCursor(request.result);
+
+ if (request.result && request.iteratedOnce) {
+ var primaryKey = request.result.primaryKey;
+ if (primaryKey) {
+ objectStore.delete(primaryKey).onsuccess = function() {
+ debug("Deleted key " + primaryKey + " from object store");
+ }
+ var nextPrimaryKey = primaryKey;
+ if (request.result.direction.startsWith("next")) {
+ nextPrimaryKey++;
+ if (nextPrimaryKey > 18)
+ nextPrimaryKey = 0;
+ } else
+ nextPrimaryKey--;
+
+ if (nextPrimaryKey > 0) {
+ objectStore.delete(nextPrimaryKey).onsuccess = function() {
+ debug("Deleted key " + nextPrimaryKey + " from object store");
+ }
+ }
+
+ // Delete an additional item for unique cursors to make sure they iterate deeper into the sets
+ // of primary keys and/or skip some index keys altogether.
+ if (request.result.direction.endsWith("unique")) {
+ var nextNextPrimaryKey = nextPrimaryKey;
+ if (request.result.direction.startsWith("next")) {
+ nextNextPrimaryKey++;
+ if (nextNextPrimaryKey > 18)
+ nextNextPrimaryKey = 0;
+ } else
+ nextNextPrimaryKey--;
+
+ if (nextNextPrimaryKey > 0) {
+ objectStore.delete(nextNextPrimaryKey).onsuccess = function() {
+ debug("Deleted key " + nextNextPrimaryKey + " from object store");
+ }
+ }
+ }
+ }
+ }
+
+ request.iteratedOnce = true;
+
+ if (request.result)
+ request.result.continue();
+ else
+ startNextCursor();
+ }
+ request.onerror = function(e) {
+ debug("Unexpected error opening or iterating cursor");
+ logCursor(request.result);
+ done();
+ }
+}
+
+function testCursorDirection(index, direction)
+{
+ var range = IDBKeyRange.lowerBound(-Infinity);
+ var request = index.openCursor(range, direction);
+ setupRequest(request);
+}
+
+var cursorCommands = [
+ "testCursorDirection(index, 'prevunique')",
+ "testCursorDirection(index, 'nextunique')",
+ "testCursorDirection(index, 'prev')",
+ "testCursorDirection(index, 'next')",
+];
+
+function startNextCursor()
+{
+ if (!cursorCommands.length) {
+ done();
+ return;
+ }
+
+ populateObjectStore();
+
+ var command = cursorCommands.pop();
+ debug("Starting a new cursor: " + command);
+ var req = index.count();
+ req.onsuccess = function() {
+ debug("TestIndex1 count is: " + req.result + "");
+ }
+
+ eval(command);
+}
+
+function populateObjectStore()
+{
+ objectStore.put({ bar: "A" }, 1);
+ objectStore.put({ bar: "A" }, 2);
+ objectStore.put({ bar: "B" }, 3);
+ objectStore.put({ bar: "B" }, 4);
+ objectStore.put({ bar: "C" }, 5);
+ objectStore.put({ bar: "C" }, 6);
+ objectStore.put({ bar: "D" }, 7);
+ objectStore.put({ bar: "D" }, 8);
+ objectStore.put({ bar: "E" }, 9);
+ objectStore.put({ bar: "E" }, 10);
+ objectStore.put({ bar: "F" }, 11);
+ objectStore.put({ bar: "F" }, 12);
+ objectStore.put({ bar: "G" }, 13);
+ objectStore.put({ bar: "G" }, 14);
+ objectStore.put({ bar: "H" }, 15);
+ objectStore.put({ bar: "H" }, 16);
+ objectStore.put({ bar: "I" }, 17);
+ objectStore.put({ bar: "I" }, 18);
+}
+
+var createRequest = window.indexedDB.open("IndexCursor3Database", 1);
+createRequest.onupgradeneeded = function(event) {
+ debug("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ var database = event.target.result;
+ objectStore = database.createObjectStore("TestObjectStore");
+ index = objectStore.createIndex("TestIndex1", "bar");
+
+ startNextCursor();
+
+ versionTransaction.onabort = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected aborted");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("Initial upgrade versionchange transaction complete");
+ done();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesindexgetcountbasicjsfromrev195319trunkLayoutTestsstorageindexeddbmodernindexgetcountbasichtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/index-get-count-basic.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/index-get-count-basic.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/index-get-count-basic.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/index-get-count-basic.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,62 @@
</span><ins>+description("This tests the most basic operation of the IDBIndex methods get(), getKey(), and count().");
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+function log(message)
+{
+ debug(message);
+}
+
+var createRequest = window.indexedDB.open("IndexGetCountBasicDatabase", 1);
+
+createRequest.onupgradeneeded = function(event) {
+ debug("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ var database = event.target.result;
+ var objectStore = database.createObjectStore("TestObjectStore");
+ var index = objectStore.createIndex("TestIndex", "bar");
+
+ objectStore.put({ bar: "good", baz: "bad" }, "foo");
+
+ var request1 = index.get("good");
+ request1.onsuccess = function() {
+ debug("get result is: " + request1.result);
+ for (n in request1.result)
+ debug(n + " is " + request1.result[n]);
+ }
+
+ request2 = index.getKey("good");
+ request2.onsuccess = function() {
+ debug("getKey result is: " + request2.result);
+ }
+
+ var request3 = index.count();
+ request3.onsuccess = function() {
+ debug("count result is: " + request3.result);
+ }
+
+ versionTransaction.onabort = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected aborted");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("Initial upgrade versionchange transaction complete");
+ done();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesindexgetcountfailuresjsfromrev195319trunkLayoutTestsstorageindexeddbmodernindexgetcountfailureshtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/index-get-count-failures.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/index-get-count-failures.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/index-get-count-failures.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/index-get-count-failures.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,166 @@
</span><ins>+description("This tests some obvious failures that can happen while calling the IDBIndex methods get(), getKey(), and count().");
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+function log(message)
+{
+ debug(message);
+}
+
+var createRequest = window.indexedDB.open("IndexGetCountFailuresDatabase", 1);
+var database;
+var index;
+
+createRequest.onupgradeneeded = function(event) {
+ debug("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ database = event.target.result;
+ var objectStore = database.createObjectStore("TestObjectStore");
+ index = objectStore.createIndex("TestIndex", "foo");
+
+ try {
+ index.get(null);
+ } catch(e) {
+ debug("Failed to get with a null key");
+ }
+
+ try {
+ index.getKey(null);
+ } catch(e) {
+ debug("Failed to getKey with a null key");
+ }
+
+ try {
+ index.count(null);
+ } catch(e) {
+ debug("Failed to count with a null range");
+ }
+
+ objectStore.deleteIndex("TestIndex");
+
+ try {
+ index.get("test");
+ } catch(e) {
+ debug("Failed to get with deleted IDBIndex");
+ }
+
+ try {
+ index.getKey("test");
+ } catch(e) {
+ debug("Failed to getKey with deleted IDBIndex");
+ }
+
+ try {
+ index.count();
+ } catch(e) {
+ debug("Failed to count with deleted IDBIndex");
+ }
+
+ try {
+ objectStore.deleteIndex("TestIndex");
+ } catch(e) {
+ debug("Failed to delete a nonexistent IDBIndex");
+ }
+
+ database.deleteObjectStore("TestObjectStore");
+ try {
+ index.get(null);
+ } catch(e) {
+ debug("Failed to get with deleted IDBObjectStore");
+ }
+
+ try {
+ index.getKey(null);
+ } catch(e) {
+ debug("Failed to getKey with deleted IDBObjectStore");
+ }
+
+ try {
+ index.count(null);
+ } catch(e) {
+ debug("Failed to count with deleted IDBObjectStore");
+ }
+
+ var objectStore = database.createObjectStore("TestObjectStore2");
+ objectStore.createIndex("TestIndex", "foo");
+
+ versionTransaction.onabort = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected aborted");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("Initial upgrade versionchange transaction complete");
+ continueTest1();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
+
+function continueTest1()
+{
+ var transaction = database.transaction("TestObjectStore2", "readonly");
+ var objectStore = transaction.objectStore("TestObjectStore2");
+ index = objectStore.index("TestIndex");
+
+ // Spin the transaction with get requests to keep it alive long enough for the setTimeout to fire.
+ var canFinish = false;
+ var spinGet = function() {
+ objectStore.get("foo").onsuccess = function() {
+ if (!canFinish)
+ spinGet();
+ }
+ }
+ spinGet();
+
+ var testWhileInactive = function() {
+ try {
+ index.get(null);
+ } catch(e) {
+ debug("Failed to get while transaction inactive");
+ }
+
+ try {
+ index.getKey(null);
+ } catch(e) {
+ debug("Failed to getKey while transaction inactive");
+ }
+
+ try {
+ index.count(null);
+ } catch(e) {
+ debug("Failed to count while transaction inactive");
+ }
+ canFinish = true;
+ }
+
+ setTimeout(testWhileInactive, 0);
+
+ transaction.onabort = function(event) {
+ debug("readonly transaction unexpected abort" + event);
+ done();
+ }
+
+ transaction.oncomplete = function(event) {
+ debug("readonly transaction complete");
+ done();
+ }
+
+ transaction.onerror = function(event) {
+ debug("readonly transaction unexpected error" + event);
+ done();
+ }
+}
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourceskeypathbasicjsfromrev195319trunkLayoutTestsstorageindexeddbmodernkeypathbasichtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/keypath-basic.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/keypath-basic.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/keypath-basic.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/keypath-basic.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,70 @@
</span><ins>+description("This test creates some object stores with keypaths. It then puts some values in them. It makes sure the keys used are as expected.");
+
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+var createRequest = window.indexedDB.open("KeypathBasicTestDatabase", 1);
+
+createRequest.onupgradeneeded = function(event) {
+ debug("ALERT: " + "Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ var database = event.target.result;
+ var objectStore1 = database.createObjectStore("OS1", { keyPath: "foo" });
+ var objectStore2 = database.createObjectStore("OS2", { keyPath: "foo.bar" });
+
+ var object = new Object;
+ object.stuff = "bar1";
+ object.foo = "foo1";
+
+ var request1 = objectStore1.put(object);
+ request1.onsuccess = function(event) {
+ debug("ALERT: " + "object put SUCCESS - " + request1.result);
+ }
+
+ var array = { foo: "foo2", stuff: "bar2" };
+
+ var request2 = objectStore1.put(array);
+ request2.onsuccess = function(event) {
+ debug("ALERT: " + "array put SUCCESS - " + request2.result);
+ }
+
+ object.foo = new Object;
+ object.foo.bar = "baz1";
+ var request3 = objectStore2.put(object);
+ request3.onsuccess = function(event) {
+ debug("ALERT: " + "Second object put SUCCESS - " + request3.result);
+ }
+
+ array.foo = { bar: "baz2" };
+
+ var request4 = objectStore2.put(array);
+ request4.onsuccess = function(event) {
+ debug("ALERT: " + "Second array put SUCCESS - " + request4.result);
+ }
+
+ versionTransaction.onabort = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction unexpected aborted");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction complete");
+ done();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesobjectstoreattributesjsfromrev195319trunkLayoutTestsstorageindexeddbmodernobjectstoreattributeshtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/objectstore-attributes.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/objectstore-attributes.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/objectstore-attributes.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/objectstore-attributes.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,102 @@
</span><ins>+description("This test exercises the readonly attributes on an IDBObjectStore.");
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+var request = window.indexedDB.open("ObjectStoreAttributesTestDatabase");
+
+function log(message)
+{
+ debug(message);
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+var database;
+
+request.onupgradeneeded = function(event)
+{
+ debug("First upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var tx = request.transaction;
+ database = event.target.result;
+
+ debug(tx + " - " + tx.mode);
+ debug(database);
+
+ var os1 = database.createObjectStore('TestObjectStore1', { autoIncrement: true , keyPath: "foo" });
+ var os2 = database.createObjectStore('TestObjectStore2', { autoIncrement: false });
+
+ debug(os1.name);
+ debug(os2.name);
+ debug(os1.autoIncrement);
+ debug(os2.autoIncrement);
+ debug(os1.keyPath);
+ debug(os2.keyPath);
+ debug(os1.transaction);
+ debug(os2.transaction);
+ debug(os1.transaction == tx);
+ debug(os2.transaction == tx);
+ debug(os1.transaction == os2.transaction);
+
+ os2.createIndex("Foo index", "foo");
+ os2.createIndex("Bar index", "bar");
+
+ var names = os2.indexNames;
+ debug("Object store has indexes:")
+ for (var i = 0; i < names.length; ++i)
+ debug(names[i]);
+
+ os2.createIndex("Baz index", "baz");
+ debug("After adding another, object store now has indexes:");
+ names = os2.indexNames;
+ for (var i = 0; i < names.length; ++i)
+ debug(names[i]);
+
+ tx.onabort = function(event) {
+ debug("First version change transaction unexpected abort");
+ done();
+ }
+
+ tx.oncomplete = function(event) {
+ debug("First version change transaction completed");
+ continueTest();
+ }
+
+ tx.onerror = function(event) {
+ debug("First version change transaction unexpected error - " + event);
+ done();
+ }
+}
+
+function continueTest()
+{
+ var transaction = database.transaction("TestObjectStore2", "readonly");
+ var objectStore = transaction.objectStore("TestObjectStore2");
+
+ debug("In a new transaction, object store has indexes:");
+ var names = objectStore.indexNames;
+ for (var i = 0; i < names.length; ++i)
+ debug(names[i]);
+
+ transaction.onabort = function(event) {
+ debug("readonly transaction unexpected abort" + event);
+ done();
+ }
+
+ transaction.oncomplete = function(event) {
+ debug("readonly transaction complete");
+ done();
+ }
+
+ transaction.onerror = function(event) {
+ debug("readonly transaction unexpected error" + event);
+ done();
+ }
+}
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesobjectstorecursoradvancefailuresjsfromrev195319trunkLayoutTestsstorageindexeddbmodernobjectstorecursoradvancefailureshtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/objectstore-cursor-advance-failures.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/objectstore-cursor-advance-failures.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/objectstore-cursor-advance-failures.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/objectstore-cursor-advance-failures.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,139 @@
</span><ins>+description("This tests some obvious failures that can happen while calling IDBCursor.advance() on object store cursors.");
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+function log(message)
+{
+ debug(message);
+}
+
+var createRequest = window.indexedDB.open("IDBAdvanceFailuresDatabase", 1);
+var database;
+
+createRequest.onupgradeneeded = function(event) {
+ debug("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ database = event.target.result;
+ var objectStore = database.createObjectStore("TestObjectStore");
+ for (var i = 0; i < 10; ++i)
+ objectStore.put("Record " + i, i);
+
+ var request = objectStore.openCursor();
+ request.onsuccess = function() {
+ var cursor = request.result;
+
+ try {
+ cursor.advance();
+ } catch(e) {
+ debug("Failed to advance object store cursor with undefined count argument");
+ }
+
+ try {
+ cursor.advance(0);
+ } catch(e) {
+ debug("Failed to advance object store cursor with '0' count argument");
+ }
+
+ try {
+ cursor.advance(-1);
+ } catch(e) {
+ debug("Failed to advance object store cursor with negative count argument");
+ }
+
+ database.deleteObjectStore("TestObjectStore");
+ try {
+ cursor.advance(1);
+ } catch(e) {
+ debug("Failed to advance object store cursor after deleting object store");
+ }
+
+ // Recreate the object store for use in the next stage of testing
+ objectStore = database.createObjectStore("TestObjectStore");
+ for (var i = 0; i < 10; ++i)
+ objectStore.put("Record " + i, i);
+ }
+
+ var os2 = database.createObjectStore("TestObjectStore2");
+ for (var i = 0; i < 10; ++i)
+ os2.put("Record " + i, i);
+
+ var request2 = os2.openCursor();
+ request2.onsuccess = function() {
+ var cursor = request2.result;
+ cursor.continue();
+ try {
+ cursor.advance(1);
+ } catch(e) {
+ debug("Failed to advance an object store cursor when it is already fetching the next record");
+ }
+ request2.onsuccess = undefined;
+ }
+
+ versionTransaction.onabort = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected aborted");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("Initial upgrade versionchange transaction complete");
+ continueTest1();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
+
+function continueTest1()
+{
+ var transaction = database.transaction("TestObjectStore", "readonly");
+ var objectStore = transaction.objectStore("TestObjectStore");
+ var cursor = objectStore.openCursor();
+
+ // Spin the transaction with get requests to keep it alive long enough for the setTimeout to fire.
+ var canFinish = false;
+ var spinGet = function() {
+ objectStore.get("foo").onsuccess = function() {
+ if (!canFinish)
+ spinGet();
+ }
+ }
+ spinGet();
+
+ var testWhileInactive = function() {
+ try {
+ cursor.advance(1);
+ } catch(e) {
+ debug("Failed to advance object store cursor while transaction inactive");
+ }
+ canFinish = true;
+ }
+
+ setTimeout(testWhileInactive, 0);
+
+ transaction.onabort = function(event) {
+ debug("readonly transaction unexpected abort" + event);
+ done();
+ }
+
+ transaction.oncomplete = function(event) {
+ debug("readonly transaction complete");
+ done();
+ }
+
+ transaction.onerror = function(event) {
+ debug("readonly transaction unexpected error" + event);
+ done();
+ }
+}
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesobjectstorecursorcontinuefailuresjsfromrev195319trunkLayoutTestsstorageindexeddbmodernobjectstorecursorcontinuefailureshtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/objectstore-cursor-continue-failures.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/objectstore-cursor-continue-failures.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/objectstore-cursor-continue-failures.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/objectstore-cursor-continue-failures.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,143 @@
</span><ins>+description("This tests some obvious failures that can happen while calling IDBCursor.continue() on object store cursors.");
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+function log(message)
+{
+ debug(message);
+}
+
+var createRequest = window.indexedDB.open("IDBContinueFailuresDatabase", 1);
+var database;
+
+createRequest.onupgradeneeded = function(event) {
+ debug("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ database = event.target.result;
+ var objectStore = database.createObjectStore("TestObjectStore");
+ for (var i = 0; i < 10; ++i)
+ objectStore.put("Record " + i, i);
+
+ var request = objectStore.openCursor();
+ request.onsuccess = function() {
+ var cursor = request.result;
+
+ try {
+ cursor.continue(-1);
+ } catch(e) {
+ debug("Failed to continue a 'next' object store cursor to a key less than the current key");
+ }
+
+ try {
+ cursor.continue(NaN);
+ } catch(e) {
+ debug("Failed to continue object store cursor with invalid key");
+ }
+
+ database.deleteObjectStore("TestObjectStore");
+ try {
+ cursor.continue();
+ } catch(e) {
+ debug("Failed to continue object store cursor after deleting object store");
+ }
+
+ // Recreate the object store for use in the next stage of testing
+ objectStore = database.createObjectStore("TestObjectStore");
+ for (var i = 0; i < 10; ++i)
+ objectStore.put("Record " + i, i);
+ }
+
+ var request2 = objectStore.openCursor(IDBKeyRange.lowerBound(-Infinity), "prev");
+ request2.onsuccess = function() {
+ var cursor = request2.result;
+ try {
+ cursor.continue(100);
+ } catch(e) {
+ debug("Failed to continue a 'prev' object store cursor to a key greater than the current key");
+ }
+ }
+
+ var os2 = database.createObjectStore("TestObjectStore2");
+ for (var i = 0; i < 10; ++i)
+ os2.put("Record " + i, i);
+
+ var request3 = os2.openCursor();
+ request3.onsuccess = function() {
+ var cursor = request3.result;
+ cursor.continue();
+ try {
+ cursor.continue();
+ } catch(e) {
+ debug("Failed to continue an object store cursor when it is already fetching the next record");
+ }
+ request3.onsuccess = undefined;
+ }
+
+ versionTransaction.onabort = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected aborted");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("Initial upgrade versionchange transaction complete");
+ continueTest1();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
+
+function continueTest1()
+{
+ var transaction = database.transaction("TestObjectStore", "readonly");
+ var objectStore = transaction.objectStore("TestObjectStore");
+ var cursor = objectStore.openCursor();
+
+ // Spin the transaction with get requests to keep it alive long enough for the setTimeout to fire.
+ var canFinish = false;
+ var spinGet = function() {
+ objectStore.get("foo").onsuccess = function() {
+ if (!canFinish)
+ spinGet();
+ }
+ }
+ spinGet();
+
+ var testWhileInactive = function() {
+ try {
+ cursor.continue();
+ } catch(e) {
+ debug("Failed to continue object store cursor while transaction inactive");
+ }
+ canFinish = true;
+ }
+
+ setTimeout(testWhileInactive, 0);
+
+ transaction.onabort = function(event) {
+ debug("readonly transaction unexpected abort" + event);
+ done();
+ }
+
+ transaction.oncomplete = function(event) {
+ debug("readonly transaction complete");
+ done();
+ }
+
+ transaction.onerror = function(event) {
+ debug("readonly transaction unexpected error" + event);
+ done();
+ }
+}
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesopencursorfailuresjsfromrev195319trunkLayoutTestsstorageindexeddbmodernopencursorfailureshtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/opencursor-failures.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/opencursor-failures.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/opencursor-failures.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/opencursor-failures.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,183 @@
</span><ins>+description("This tests some obvious failures that can happen while opening cursors.");
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+function log(message)
+{
+ debug(message);
+}
+
+var createRequest = window.indexedDB.open("OpenCursorFailuresDatabase", 1);
+var database;
+var objectStore;
+var index;
+
+createRequest.onupgradeneeded = function(event) {
+ debug("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ database = event.target.result;
+ objectStore = database.createObjectStore("TestObjectStore");
+ index = objectStore.createIndex("TestIndex", "bar");
+ var request = objectStore.put({ bar: "bar" }, "foo");
+
+ request.onsuccess = function() {
+ try {
+ objectStore.openCursor(NaN);
+ } catch(e) {
+ debug("Failed to open object store cursor with invalid keypath");
+ }
+
+ try {
+ objectStore.openCursor("foo", "invalid direction");
+ } catch(e) {
+ debug("Failed to open object store cursor with invalid direction");
+ }
+
+ try {
+ index.openCursor(NaN);
+ } catch(e) {
+ debug("Failed to open index cursor with invalid keypath");
+ }
+
+ try {
+ index.openCursor("foo", "invalid direction");
+ } catch(e) {
+ debug("Failed to open index cursor with invalid direction");
+ }
+
+ try {
+ index.openKeyCursor(NaN);
+ } catch(e) {
+ debug("Failed to open index key cursor with invalid keypath");
+ }
+
+ try {
+ index.openKeyCursor("foo", "invalid direction");
+ } catch(e) {
+ debug("Failed to open index key cursor with invalid direction");
+ }
+
+ database.deleteObjectStore("TestObjectStore");
+
+ try {
+ objectStore.openCursor();
+ } catch(e) {
+ debug("Failed to open object store cursor on deleted object store");
+ }
+
+ try {
+ index.openCursor();
+ } catch(e) {
+ debug("Failed to open index cursor on deleted object store");
+ }
+
+ try {
+ index.openKeyCursor();
+ } catch(e) {
+ debug("Failed to open index key cursor on deleted object store");
+ }
+
+ // Recreate the objectstore because we'll need it in phase 2.
+ objectStore = database.createObjectStore("TestObjectStore");
+ index = objectStore.createIndex("TestIndex", "bar");
+ objectStore.put({ bar: "bar" }, "foo");
+ }
+
+ versionTransaction.onabort = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected aborted");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("Initial upgrade versionchange transaction complete");
+ continueTest1();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
+
+function continueTest1()
+{
+ try {
+ objectStore.openCursor();
+ } catch(e) {
+ debug("Failed to open object store cursor from completed transaction");
+ }
+
+ try {
+ index.openCursor();
+ } catch(e) {
+ debug("Failed to open index cursor from completed transaction");
+ }
+
+ try {
+ index.openKeyCursor();
+ } catch(e) {
+ debug("Failed to open index key cursor from completed transaction");
+ }
+
+ var transaction = database.transaction("TestObjectStore", "readonly");
+ objectStore = transaction.objectStore("TestObjectStore");
+ index = objectStore.index("TestIndex");
+
+ // Spin the transaction with get requests to keep it alive long enough for the setTimeout to fire.
+ var canFinish = false;
+ var spinGet = function() {
+ objectStore.get("foo").onsuccess = function() {
+ if (!canFinish)
+ spinGet();
+ }
+ }
+ spinGet();
+
+ var getWhileInactive = function() {
+ try {
+ objectStore.openCursor();
+ } catch(e) {
+ debug("Failed to open object store cursor from inactive transaction");
+ }
+
+ try {
+ index.openCursor();
+ } catch(e) {
+ debug("Failed to open index cursor from inactive transaction");
+ }
+
+ try {
+ index.openKeyCursor();
+ } catch(e) {
+ debug("Failed to open index key cursor from inactive transaction");
+ }
+ canFinish = true;
+ }
+
+ setTimeout(getWhileInactive, 0);
+
+ transaction.onabort = function(event) {
+ debug("readonly transaction unexpected abort" + event);
+ done();
+ }
+
+ transaction.oncomplete = function(event) {
+ debug("readonly transaction complete");
+ done();
+ }
+
+ transaction.onerror = function(event) {
+ debug("readonly transaction unexpected error" + event);
+ done();
+ }
+}
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesopendatabaserequesteventjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/modern/resources/opendatabase-request-event.js (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/opendatabase-request-event.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/opendatabase-request-event.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,45 @@
</span><ins>+description("This test calls open on window.indexedDB in various ways, verifying that IDBOpenDBRequest objects are returned when expected and exceptions are thrown when expected.");
+
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+try {
+ window.indexedDB.open("TestDatabase", 0);
+} catch (e) {
+ debug("ALERT: " + "Caught exception " + e);
+}
+
+try {
+ window.indexedDB.open("TestDatabase", -1);
+} catch (e) {
+ debug("ALERT: " + "Caught exception " + e);
+}
+
+var request = window.indexedDB.open("TestDatabase");
+debug("ALERT: " + request);
+
+request.onsuccess = function()
+{
+ debug("ALERT: " + "success");
+ done();
+}
+request.onerror = function(e)
+{
+ debug("ALERT: " + "error " + e);
+ done();
+}
+
+request.onupgradeneeded = function(e)
+{
+ debug("ALERT: " + "upgradeneeded: old version - " + e.oldVersion + " new version - " + e.newVersion);
+ done();
+}
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesopendatabaserequestjsfromrev195319trunkLayoutTestsstorageindexeddbmodernopendatabaserequesthtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/opendatabase-request.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/opendatabase-request.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/opendatabase-request.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/opendatabase-request.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+description("This test calls open on window.indexedDB in various ways, verifying that IDBOpenDBRequest objects are returned when expected and exceptions are thrown when expected.");
+
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+var request = window.indexedDB.open("TestDatabase");
+debug("ALERT: " + request);
+
+request = window.indexedDB.open("");
+debug("ALERT: " + request);
+
+try {
+ var request = window.indexedDB.open();
+} catch (e) {
+ debug("ALERT: " + e);
+}
+
+try {
+ var request = window.indexedDB.open("name", 0);
+} catch (e) {
+ debug("ALERT: " + e);
+}
+
+done();
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesopendatabasesuccessafterversionchangejsfromrev195319trunkLayoutTestsstorageindexeddbmodernopendatabasesuccessafterversionchangehtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/opendatabase-success-after-versionchange.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/opendatabase-success-after-versionchange.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/opendatabase-success-after-versionchange.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/opendatabase-success-after-versionchange.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,56 @@
</span><ins>+description("This test verifies that: \
+ - Opening a new database results in the onupgradeneeded handler being called on the IDBOpenDBRequest. \
+ - The versionchange transaction representing the upgrade commits successfully. \
+ - After that transaction commits, the onsuccess handler on the original IDBOpenDBRequest is called.");
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+function log(message)
+{
+ debug(message);
+}
+
+var request = window.indexedDB.open("OpenDatabaseSuccessAfterVersionChangeDatabase");
+
+request.onsuccess = function()
+{
+ debug("Got the onsuccess handler as expected.");
+ done();
+}
+request.onerror = function(e)
+{
+ debug("Unexpected onerror handler called");
+ done();
+}
+
+request.onupgradeneeded = function(e)
+{
+ debug("upgradeneeded: old version - " + e.oldVersion + " new version - " + e.newVersion);
+ debug(request.transaction);
+
+ request.transaction.oncomplete = function()
+ {
+ debug("Version change complete");
+ }
+
+ request.transaction.onabort = function()
+ {
+ debug("Version change unexpected abort");
+ done();
+ }
+
+ request.transaction.onerror = function()
+ {
+ debug("Version change unexpected error");
+ done();
+ }
+}
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesopendatabaseversionsjsfromrev195319trunkLayoutTestsstorageindexeddbmodernopendatabaseversionshtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/opendatabase-versions.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/opendatabase-versions.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/opendatabase-versions.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/opendatabase-versions.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,138 @@
</span><ins>+description("This test creates a new database with the default version, commits that versionchange transaction, and then reopens it at different versions to make sure the IDBOpenDBRequests behave appropriately.");
+
+
+
+function log(msg)
+{
+ document.getElementById("logger").innerHTML += msg + "";
+}
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+var request = window.indexedDB.open("VersionTestDatabase");
+debug(request + " (firstPhase)");
+
+request.onsuccess = function()
+{
+ debug("First version change successful");
+}
+request.onerror = function(e)
+{
+ debug("Open request error (firstPhase) " + request.error.name);
+}
+
+request.onupgradeneeded = function(e)
+{
+ var database = event.target.result;
+
+ debug("upgradeneeded (firstPhase): old version - " + e.oldVersion + " new version - " + e.newVersion);
+ debug(request.transaction);
+ request.transaction.oncomplete = function()
+ {
+ debug("Version change complete (firstPhase). Database version is now - " + database.version);
+ database.close();
+ secondPhase();
+ }
+ request.transaction.onabort = function()
+ {
+ debug("Version change transaction unexpected abort! (firstPhase)");
+ done();
+ }
+ request.transaction.onerror = function()
+ {
+ debug("Version change transaction unexpected error! (firstPhase)");
+ done();
+ }
+}
+
+function secondPhase()
+{
+ var request = window.indexedDB.open("VersionTestDatabase", 1);
+ debug(request + " (secondPhase)");
+ request.onsuccess = function()
+ {
+ debug("Successfully opened database at version 1 (secondPhase)");
+ request.result.close();
+ request.result.close(); // Close it twice just for the heck of it
+ thirdPhase();
+ }
+ request.onerror = function(e)
+ {
+ debug("Unexpected error (secondPhase)" + e);
+ done();
+ }
+ request.onupgradeneeded = function(e)
+ {
+ debug("Unexpected upgrade needed (secondPhase)" + e);
+ done();
+ }
+}
+
+function thirdPhase()
+{
+ var request = window.indexedDB.open("VersionTestDatabase", 2);
+ debug(request + " (thirdPhase)");
+ request.onsuccess = function()
+ {
+ debug("Version change to version 2 successful");
+ }
+ request.onerror = function(e)
+ {
+ debug("Open request error (thirdPhase) " + request.error.name);
+ }
+ request.onupgradeneeded = function(e)
+ {
+ var database = event.target.result;
+
+ debug("upgradeneeded (thirdPhase): old version - " + e.oldVersion + " new version - " + e.newVersion);
+ debug(request.transaction);
+ request.transaction.oncomplete = function()
+ {
+ debug("Version change complete (thirdPhase). Database version is now - " + database.version);
+ database.close();
+ fourthPhase();
+ }
+ request.transaction.onabort = function()
+ {
+ debug("Version change transaction unexpected abort! (thirdPhase)");
+ done();
+ }
+ request.transaction.onerror = function()
+ {
+ debug("Version change transaction unexpected error! (thirdPhase)");
+ done();
+ }
+ }
+}
+
+function fourthPhase()
+{
+ // We've upgraded to version 2, so version 1 should not be openable.
+ var request = window.indexedDB.open("VersionTestDatabase", 1);
+ debug(request + " (fourthPhase)");
+ request.onsuccess = function()
+ {
+ debug("Unexpected success (fourthPhase)");
+ done();
+ }
+ request.onerror = function(e)
+ {
+ debug("Expected error (fourthPhase) - " + request.error.name);
+ done();
+ }
+ request.onupgradeneeded = function(e)
+ {
+ debug("Unexpected upgradeneeded (fourthPhase)");
+ done();
+ }
+}
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesrequestreadystatejs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/modern/resources/request-readystate.js (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/request-readystate.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/request-readystate.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,60 @@
</span><ins>+description("This test makes sure that IDBRequest.readyState returns expected values.");
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+function log(message)
+{
+ debug(message);
+}
+
+var createRequest = window.indexedDB.open("RequestReadyStateDatabase", 1);
+debug("After calling indexedDB.open(), create request readyState is: " + createRequest.readyState);
+
+createRequest.onupgradeneeded = function(event) {
+ debug("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+ debug("Create request readyState is: " + createRequest.readyState);
+
+ var versionTransaction = createRequest.transaction;
+ var database = event.target.result;
+ var objectStore = database.createObjectStore("TestObjectStore");
+
+ for (var i = 0; i < 2; ++i)
+ objectStore.put("Record " + i, i);
+
+ var request = objectStore.openCursor();
+ debug("After calling openCursor, request readyState is: " + request.readyState);
+ request.onsuccess = function() {
+ debug("After successful opening of the cursor, request readyState is: " + request.readyState);
+
+ request.onsuccess = function() {
+ debug("After continue() completed, request readyState is: " + request.readyState);
+ }
+
+ request.result.continue();
+ debug("After calling continue(), request readyState is: " + request.readyState);
+ }
+
+ versionTransaction.onabort = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected aborted");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("Initial upgrade versionchange transaction complete");
+ done();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("Initial upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+}
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcestransactionscheduler1jsfromrev195319trunkLayoutTestsstorageindexeddbmoderntransactionscheduler1html"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/transaction-scheduler-1.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/transaction-scheduler-1.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/transaction-scheduler-1.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/transaction-scheduler-1.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,118 @@
</span><ins>+description("This test makes sure that two read-only transactions to an object store are active at the same time.");
+
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+var createRequest = window.indexedDB.open("TransactionScheduler1Database");
+
+createRequest.onupgradeneeded = function(event) {
+ debug("ALERT: " + "Upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ var database = event.target.result;
+ var objectStore = database.createObjectStore("TestObjectStore");
+ var request = objectStore.put("foo", "bar");
+
+ request.onerror = function(event) {
+ debug("ALERT: " + "put FAILED - " + event);
+ done();
+ }
+
+ versionTransaction.onabort = function(event) {
+ debug("ALERT: " + "versionchange transaction aborted");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("ALERT: " + "versionchange transaction completed");
+ continueTest();
+ database.close();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("ALERT: " + "versionchange transaction error'ed - " + event);
+ done();
+ }
+}
+
+function continueTest()
+{
+ var request1 = window.indexedDB.open("TransactionScheduler1Database", 1);
+ var request2 = window.indexedDB.open("TransactionScheduler1Database", 1);
+
+ setupRequest(request1, "request 1");
+ setupRequest(request2, "request 2");
+}
+
+function setupRequest(request, reqName)
+{
+ request.onsuccess = function(event) {
+ debug("ALERT: " + "Success opening database connection - " + reqName);
+ var database = event.target.result;
+
+ startTransactionLoop(event.target.result.transaction("TestObjectStore", "readonly"), true);
+ }
+ request.onerror = function(event) {
+ debug("ALERT: " + "Unexpected error - " + reqName + " - " + event);
+ done();
+ }
+ request.onblocked = function(event) {
+ debug("ALERT: " + "Unexpected blocked - " + reqName + " - " + event);
+ done();
+ }
+ request.onupgradeneeded = function(event) {
+ debug("ALERT: " + "Unexpected upgradeneeded - " + reqName + " - " + event);
+ done();
+ }
+}
+
+var numberOfOpenTransactions = 0;
+
+function startTransactionLoop(transaction, isFirstTime)
+{
+ var objectStore = transaction.objectStore("TestObjectStore");
+ var request = objectStore.get("bar");
+
+ request.onsuccess = function(event) {
+ if (isFirstTime)
+ numberOfOpenTransactions++;
+
+ if (numberOfOpenTransactions == 2) {
+ debug("ALERT: " + "Two transactions open at once. Yay.");
+ done();
+ }
+ startTransactionLoop(event.target.transaction, false);
+ }
+
+ request.onerror = function(event) {
+ debug("ALERT: " + "Unexpected request error - " + event);
+ done();
+ }
+
+ transaction.onerror = function(event) {
+ debug("ALERT: " + "Unexpected transaction error - " + event);
+ done();
+ }
+
+ transaction.onabort = function(event) {
+ --numberOfOpenTransactions;
+ debug("ALERT: " + "Unexpected transaction abort - " + event);
+ done();
+ }
+
+ transaction.oncomplete = function(event) {
+ --numberOfOpenTransactions;
+ debug("ALERT: " + "Unexpected transaction complete - " + event);
+ done();
+ }
+}
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcestransactionscheduler2jsfromrev195319trunkLayoutTestsstorageindexeddbmoderntransactionscheduler2html"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/transaction-scheduler-2.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/transaction-scheduler-2.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/transaction-scheduler-2.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/transaction-scheduler-2.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,124 @@
</span><ins>+description("This test makes sure that two read-only transactions to two different object stores are active at the same time.");
+
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+var createRequest = window.indexedDB.open("TransactionScheduler2Database");
+
+createRequest.onupgradeneeded = function(event) {
+ debug("ALERT: " + "Upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ var database = event.target.result;
+ var objectStore = database.createObjectStore("OS1");
+ var request = objectStore.put("foo1", "bar1");
+
+ request.onerror = function(event) {
+ debug("ALERT: " + "put1 FAILED - " + event);
+ done();
+ }
+
+ objectStore = database.createObjectStore("OS2");
+ request = objectStore.put("foo2", "bar2");
+
+ request.onerror = function(event) {
+ debug("ALERT: " + "put2 FAILED - " + event);
+ done();
+ }
+
+ versionTransaction.onabort = function(event) {
+ debug("ALERT: " + "versionchange transaction aborted");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("ALERT: " + "versionchange transaction completed");
+ continueTest();
+ database.close();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("ALERT: " + "versionchange transaction error'ed - " + event);
+ done();
+ }
+}
+
+function continueTest()
+{
+ var request1 = window.indexedDB.open("TransactionScheduler2Database", 1);
+ var request2 = window.indexedDB.open("TransactionScheduler2Database", 1);
+
+ setupRequest(request1, "OS1");
+ setupRequest(request2, "OS2");
+}
+
+function setupRequest(request, osname)
+{
+ request.onsuccess = function(event) {
+ debug("ALERT: " + "Success opening database connection - Starting transaction to ObjectStore " + osname);
+ startTransactionLoop(event.target.result.transaction(osname, "readonly"), osname, true);
+ }
+ request.onerror = function(event) {
+ debug("ALERT: " + "Unexpected error - " + osname + " - " + event);
+ done();
+ }
+ request.onblocked = function(event) {
+ debug("ALERT: " + "Unexpected blocked - " + osname + " - " + event);
+ done();
+ }
+ request.onupgradeneeded = function(event) {
+ debug("ALERT: " + "Unexpected upgradeneeded - " + osname + " - " + event);
+ done();
+ }
+}
+
+var numberOfOpenTransactions = 0;
+
+function startTransactionLoop(transaction, osname, isFirstTime)
+{
+ var objectStore = transaction.objectStore(osname);
+ var request = objectStore.get("bar");
+
+ request.onsuccess = function(event) {
+ if (isFirstTime)
+ numberOfOpenTransactions++;
+
+ if (numberOfOpenTransactions == 2) {
+ debug("ALERT: " + "Two transactions open at once. Yay.");
+ done();
+ }
+ startTransactionLoop(event.target.transaction, osname, false);
+ }
+
+ request.onerror = function(event) {
+ debug("ALERT: " + "Unexpected request error - " + event);
+ done();
+ }
+
+ transaction.onerror = function(event) {
+ debug("ALERT: " + "Unexpected transaction error - " + event);
+ done();
+ }
+
+ transaction.onabort = function(event) {
+ --numberOfOpenTransactions;
+ debug("ALERT: " + "Unexpected transaction abort - " + event);
+ done();
+ }
+
+ transaction.oncomplete = function(event) {
+ --numberOfOpenTransactions;
+ debug("ALERT: " + "Unexpected transaction complete - " + event);
+ done();
+ }
+}
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcestransactionscheduler3jsfromrev195319trunkLayoutTestsstorageindexeddbmoderntransactionscheduler3html"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/transaction-scheduler-3.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/transaction-scheduler-3.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/transaction-scheduler-3.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/transaction-scheduler-3.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,139 @@
</span><ins>+description("This test makes sure that a write transaction is blocked by a read transaction with overlapping scope. It also makes sure the write transaction starts after the read transaction completes.");
+
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+var createRequest = window.indexedDB.open("TransactionScheduler3Database");
+
+createRequest.onupgradeneeded = function(event) {
+ debug("ALERT: " + "Upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ var database = event.target.result;
+ var objectStore = database.createObjectStore("OS");
+ var request = objectStore.put("bar", "foo");
+
+ request.onerror = function(event) {
+ debug("ALERT: " + "put FAILED - " + event);
+ done();
+ }
+
+ versionTransaction.onabort = function(event) {
+ debug("ALERT: " + "versionchange transaction aborted");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("ALERT: " + "versionchange transaction completed");
+ continueTest();
+ database.close();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("ALERT: " + "versionchange transaction error'ed - " + event);
+ done();
+ }
+}
+
+var secondDatabaseConnection;
+function continueTest()
+{
+ var longRunningReadRequest = window.indexedDB.open("TransactionScheduler3Database", 1);
+ longRunningReadRequest.onsuccess = function(event) {
+ debug("ALERT: " + "Success opening database connection - Starting readonly transaction");
+ secondDatabaseConnection = event.target.result;
+ readTransactionLoop(secondDatabaseConnection.transaction("OS", "readonly"), true);
+ }
+ longRunningReadRequest.onerror = function(event) {
+ debug("ALERT: " + "Long running read request unexpected error - " + event);
+ done();
+ }
+ longRunningReadRequest.onblocked = function(event) {
+ debug("ALERT: " + "Long running read request unexpected blocked - " + event);
+ done();
+ }
+ longRunningReadRequest.onupgradeneeded = function(event) {
+ debug("ALERT: " + "Long running read request unexpected upgradeneeded - " + event);
+ done();
+ }
+}
+
+var shouldEndReadTransaction = false;
+
+function readTransactionLoop(transaction, isFirstTime)
+{
+ var objectStore = transaction.objectStore("OS");
+ var request = objectStore.get("foo");
+
+ request.onsuccess = function(event) {
+ if (!shouldEndReadTransaction)
+ readTransactionLoop(event.target.transaction, false);
+
+ // Now that the read transaction is open, the write transaction can be started, but it will be blocked to start with.
+ if (isFirstTime)
+ startWriteTransaction()
+ }
+
+ request.onerror = function(event) {
+ debug("ALERT: " + "Unexpected request error - " + event);
+ done();
+ }
+
+ transaction.onerror = function(event) {
+ debug("ALERT: " + "Unexpected transaction error - " + event);
+ done();
+ }
+
+ transaction.onabort = function(event) {
+ debug("ALERT: " + "Unexpected transaction abort - " + event);
+ done();
+ }
+
+ transaction.oncomplete = function(event) {
+ debug("ALERT: " + "Read transaction complete - " + event);
+ }
+}
+
+function startWriteTransaction()
+{
+ debug("ALERT: " + "Creating write transaction");
+ var transaction = secondDatabaseConnection.transaction("OS", "readwrite");
+ var objectStore = transaction.objectStore("OS");
+ var request = objectStore.put("baz", "foo");
+
+ setTimeout("shouldEndReadTransaction = true;", 0);
+
+ request.onsuccess = function(event) {
+ debug("ALERT: " + "Write transaction put success");
+ }
+
+ request.onerror = function(event) {
+ debug("ALERT: " + "Write transaction put unexpected error - " + event);
+ done();
+ }
+
+ transaction.onerror = function(event) {
+ debug("ALERT: " + "Write transaction unexpected error - " + event);
+ done();
+ }
+
+ transaction.onabort = function(event) {
+ debug("ALERT: " + "Write transaction unexpected abort - " + event);
+ done();
+ }
+
+ transaction.oncomplete = function(event) {
+ debug("ALERT: " + "Write transaction complete - " + event);
+ done();
+ }
+}
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcestransactionscheduler5jsfromrev195319trunkLayoutTestsstorageindexeddbmoderntransactionscheduler5html"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/transaction-scheduler-5.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/transaction-scheduler-5.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/transaction-scheduler-5.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/transaction-scheduler-5.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,164 @@
</span><ins>+description("This test creates two object stores. \
+It then opens two long running read-only transactions, one per object store. \
+It then opens a read-write transaction to both object stores. \
+The read-only transactions both need to finish before the read-write transaction starts.");
+
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+var createRequest = window.indexedDB.open("TransactionScheduler5Database");
+
+createRequest.onupgradeneeded = function(event) {
+ debug("ALERT: " + "Upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ var database = event.target.result;
+ var objectStore = database.createObjectStore("OS1");
+ var request = objectStore.put("bar", "foo");
+
+ request.onerror = function(event) {
+ debug("ALERT: " + "first put FAILED - " + event);
+ done();
+ }
+
+ objectStore = database.createObjectStore("OS2");
+ request = objectStore.put("bar", "foo");
+
+ request.onerror = function(event) {
+ debug("ALERT: " + "second put FAILED - " + event);
+ done();
+ }
+
+ versionTransaction.onabort = function(event) {
+ debug("ALERT: " + "versionchange transaction aborted");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("ALERT: " + "versionchange transaction completed");
+ continueTest();
+ database.close();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("ALERT: " + "versionchange transaction error'ed - " + event);
+ done();
+ }
+}
+
+var secondDatabaseConnection;
+var readWriteTransaction;
+
+function setupReadTransactionCallbacks(transaction)
+{
+ transaction.onerror = function(event) {
+ debug("ALERT: " + "Unexpected transaction error - " + event);
+ done();
+ }
+
+ transaction.onabort = function(event) {
+ debug("ALERT: " + "Unexpected transaction abort - " + event);
+ done();
+ }
+
+ transaction.oncomplete = function(event) {
+ debug("ALERT: " + "Read transaction complete - " + event);
+ }
+
+ transaction.hasDoneFirstRead = false;
+}
+
+function continueTest()
+{
+ var openDBRequest = window.indexedDB.open("TransactionScheduler5Database", 1);
+ openDBRequest.onsuccess = function(event) {
+ debug("ALERT: " + "Success opening database connection - Starting transactions");
+ secondDatabaseConnection = event.target.result;
+
+ var transaction1 = secondDatabaseConnection.transaction("OS1", "readonly");
+ setupReadTransactionCallbacks(transaction1);
+ var transaction2 = secondDatabaseConnection.transaction("OS2", "readonly");
+ setupReadTransactionCallbacks(transaction2);
+
+ readTransactionLoop(transaction1, "OS1", false);
+ readTransactionLoop(transaction2, "OS2", true);
+ }
+ openDBRequest.onerror = function(event) {
+ debug("ALERT: " + "Long running read request unexpected error - " + event);
+ done();
+ }
+ openDBRequest.onblocked = function(event) {
+ debug("ALERT: " + "Long running read request unexpected blocked - " + event);
+ done();
+ }
+ openDBRequest.onupgradeneeded = function(event) {
+ debug("ALERT: " + "Long running read request unexpected upgradeneeded - " + event);
+ done();
+ }
+}
+
+var shouldEndReadTransaction = false;
+
+function readTransactionLoop(transaction, osname, shouldStartWrite)
+{
+ var objectStore = transaction.objectStore(osname);
+ var request = objectStore.get("foo");
+
+ request.onsuccess = function(event) {
+ if (shouldEndReadTransaction && transaction.hasDoneFirstRead)
+ return;
+
+ transaction.hasDoneFirstRead = true;
+ readTransactionLoop(event.target.transaction, osname, false);
+
+ if (shouldStartWrite)
+ startWriteTransaction();
+ }
+
+ request.onerror = function(event) {
+ debug("ALERT: " + "Unexpected request error - " + event);
+ done();
+ }
+}
+
+function startWriteTransaction()
+{
+ debug("ALERT: " + "Starting write transaction");
+ var transaction = secondDatabaseConnection.transaction(["OS1", "OS2"], "readwrite");
+ var objectStore = transaction.objectStore("OS1");
+ var request = objectStore.put("baz", "foo");
+
+ shouldEndReadTransaction = true;
+
+ request.onsuccess = function(event) {
+ debug("ALERT: " + "Write to OS1 successful");
+ }
+
+ request.onerror = function(event) {
+ debug("ALERT: " + "Write transaction put unexpected error - " + event);
+ done();
+ }
+
+ objectStore = transaction.objectStore("OS2");
+ request = objectStore.put("baz", "foo");
+
+ request.onsuccess = function(event) {
+ debug("ALERT: " + "Write to OS2 successful");
+ done();
+ }
+
+ request.onerror = function(event) {
+ debug("ALERT: " + "Write transaction put unexpected error - " + event);
+ done();
+ }
+}
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcestransactionscheduler6jsfromrev195319trunkLayoutTestsstorageindexeddbmoderntransactionscheduler6html"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/transaction-scheduler-6.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/transaction-scheduler-6.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/transaction-scheduler-6.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/transaction-scheduler-6.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,122 @@
</span><ins>+description("This test starts two read-only transactions to an object store followed by a read-write transaction. \
+It verifies that the read-write doesn't start until both read-onlys have finished.");
+
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+var createRequest = window.indexedDB.open("TransactionScheduler6Database");
+var database;
+
+createRequest.onupgradeneeded = function(event) {
+ debug("ALERT: " + "Upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ database = event.target.result;
+ var objectStore = database.createObjectStore("TestObjectStore");
+ var request = objectStore.put("foo", "bar");
+
+ request.onerror = function(event) {
+ debug("ALERT: " + "put FAILED - " + event);
+ done();
+ }
+
+ versionTransaction.onabort = function(event) {
+ debug("ALERT: " + "versionchange transaction aborted");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("ALERT: " + "versionchange transaction completed");
+ continueTest();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("ALERT: " + "versionchange transaction error'ed - " + event);
+ done();
+ }
+}
+
+function continueTest()
+{
+ startTransactionLoop(database.transaction("TestObjectStore", "readonly"), true);
+ startTransactionLoop(database.transaction("TestObjectStore", "readonly"), true);
+
+ var transaction = database.transaction("TestObjectStore", "readwrite");
+ var objectStore = transaction.objectStore("TestObjectStore");
+ var request = objectStore.put("baz", "foo");
+
+ request.onsuccess = function(event) {
+ debug("ALERT: " + "Write in readwrite transaction succeeded");
+ }
+
+ request.onerror = function(event) {
+ debug("ALERT: " + "Write in readwrite transaction unexpectedly failed");
+ done();
+ }
+
+ transaction.onabort = function(event) {
+ debug("ALERT: " + "readwrite transaction expectedly aborted");
+ done();
+ }
+
+ transaction.oncomplete = function(event) {
+ debug("ALERT: " + "readwrite transaction completed");
+ done();
+ }
+
+ transaction.onerror = function(event) {
+ debug("ALERT: " + "readwrite transaction error'ed - " + event);
+ done();
+ }
+}
+
+var numberOfOpenTransactions = 0;
+
+function startTransactionLoop(transaction, isFirstTime)
+{
+ var objectStore = transaction.objectStore("TestObjectStore");
+ var request = objectStore.get("bar");
+
+ request.onsuccess = function(event) {
+ if (isFirstTime) {
+ debug("ALERT: " + "Starting a readonly transaction");
+ numberOfOpenTransactions++;
+ }
+
+ if (numberOfOpenTransactions == 2)
+ return;
+
+ startTransactionLoop(event.target.transaction, false);
+ }
+
+ request.onerror = function(event) {
+ debug("ALERT: " + "Unexpected request error - " + event);
+ done();
+ }
+
+ transaction.onerror = function(event) {
+ debug("ALERT: " + "Unexpected transaction error - " + event);
+ done();
+ }
+
+ transaction.onabort = function(event) {
+ --numberOfOpenTransactions;
+ debug("ALERT: " + "Unexpected transaction abort - " + event);
+ done();
+ }
+
+ transaction.oncomplete = function(event) {
+ --numberOfOpenTransactions;
+ debug("ALERT: " + "readonly transaction completed");
+ }
+}
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcestransactionsstoponnavigation2html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/resources/transactions-stop-on-navigation-2.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/transactions-stop-on-navigation-2.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/transactions-stop-on-navigation-2.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,13 +1,13 @@
</span><del>-Makes sure transactions stop on navigation to a new page.<br>
-If the previous page's transaction is blindly charging forward, this test will probably timeout.<br>
-If the previous page's connection/transactions did not clean up properly, the delete request in this test will incorrectly be blocked.<br>
-If every thing is peachy keen, the delete request in this test will correctly succeed.<br>
</del><ins>+Makes sure transactions stop on navigation to a new page.
+If the previous page's transaction is blindly charging forward, this test will probably timeout.
+If the previous page's connection/transactions did not clean up properly, the delete request in this test will incorrectly be blocked.
+If every thing is peachy keen, the delete request in this test will correctly succeed.
</ins><span class="cx"> <div id="logger"></div>
</span><span class="cx"> <script>
</span><span class="cx">
</span><span class="cx"> function log(msg)
</span><span class="cx"> {
</span><del>- document.getElementById("logger").innerHTML += msg + "<br>";
</del><ins>+ document.getElementById("logger").innerHTML += msg + "";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function done()
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesversionchangeabortthenreopenjsfromrev195319trunkLayoutTestsstorageindexeddbmodernversionchangeabortthenreopenhtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/versionchange-abort-then-reopen.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/versionchange-abort-then-reopen.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/versionchange-abort-then-reopen.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/versionchange-abort-then-reopen.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,111 @@
</span><ins>+description("This test opens a new database, then aborts the version change transaction. \
+It then reopens the database, making sure it's a default, empty database, and changes the version successfully. \
+It then reopens the database, upgrading it's version. It aborts this versionchange, as well. \
+Finally it reopens the database again, upgrading its version, making sure things had reverted back to before the second aborted versionchange.");
+
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+var createRequest = window.indexedDB.open("VersionChangeAbortTestDatabase", 1);
+
+createRequest.onupgradeneeded = function(event) {
+ debug("ALERT: " + "Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ var database = event.target.result;
+
+ versionTransaction.abort();
+
+ versionTransaction.onabort = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction aborted");
+ continueTest1();
+ database.close();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction unexpected complete");
+ done();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("ALERT: " + "Initial upgrade versionchange transaction error " + event);
+ }
+}
+
+function continueTest1()
+{
+ createRequest = window.indexedDB.open("VersionChangeAbortTestDatabase", 1);
+
+ createRequest.onupgradeneeded = function(event) {
+ debug("ALERT: " + "Second upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ var database = event.target.result;
+
+ versionTransaction.onabort = function(event) {
+ debug("ALERT: " + "Second upgrade versionchange transaction unexpected abort");
+ done();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("ALERT: " + "Second upgrade versionchange transaction complete");
+ continueTest2();
+ database.close();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("ALERT: " + "Second upgrade versionchange transaction unexpected error" + event);
+ done();
+ }
+ }
+}
+
+function continueTest2()
+{
+ createRequest = window.indexedDB.open("VersionChangeAbortTestDatabase", 2);
+
+ createRequest.onupgradeneeded = function(event) {
+ debug("ALERT: " + "Third upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+
+ var versionTransaction = createRequest.transaction;
+ var database = event.target.result;
+
+ versionTransaction.abort();
+
+ versionTransaction.onabort = function(event) {
+ debug("ALERT: " + "Third upgrade versionchange transaction aborted");
+ continueTest3();
+ database.close();
+ }
+
+ versionTransaction.oncomplete = function(event) {
+ debug("ALERT: " + "Third upgrade versionchange transaction unexpected complete");
+ done();
+ }
+
+ versionTransaction.onerror = function(event) {
+ debug("ALERT: " + "Third upgrade versionchange transaction error" + event);
+ }
+ }
+}
+
+function continueTest3()
+{
+ createRequest = window.indexedDB.open("VersionChangeAbortTestDatabase", 2);
+
+ createRequest.onupgradeneeded = function(event) {
+ debug("ALERT: " + "Fourth upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
+ var database = event.target.result;
+ done();
+ }
+}
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesversionchangeeventjsfromrev195319trunkLayoutTestsstorageindexeddbmodernversionchangeeventhtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/storage/indexeddb/modern/resources/versionchange-event.js (from rev 195319, trunk/LayoutTests/storage/indexeddb/modern/versionchange-event.html) (0 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/versionchange-event.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/versionchange-event.js 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -0,0 +1,114 @@
</span><ins>+description("This test: \
+-Opens a connection to a database at version 1, creating the database \
+-Commits the version change transaction for that database \
+-Opens a second connection to that database, requesting version 1 \
+-Opens a third connection to that database, requesting version 2 \
+-Makes sure the first and second connections get the versionchange event \
+-Closes the first and second connections \
+-Makes sure the versionchange transaction for the second connection starts successfully");
+
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function done()
+{
+ finishJSTest();
+}
+
+var request = window.indexedDB.open("VersionChangeTestDatabase");
+var connection1;
+var connection2;
+
+request.onsuccess = function()
+{
+ debug("ALERT: " + "First version change successful");
+}
+request.onerror = function(e)
+{
+ debug("ALERT: " + "Unexpected error (firstPhase)");
+ done();
+}
+
+request.onupgradeneeded = function(e)
+{
+ var database = event.target.result;
+
+ debug("ALERT: " + "upgradeneeded (firstPhase): old version - " + e.oldVersion + " new version - " + e.newVersion);
+ request.transaction.oncomplete = function()
+ {
+ debug("ALERT: " + "Version change complete (firstPhase). Database version is now - " + database.version);
+
+ connection1 = database;
+ connection1.onversionchange = function(e)
+ {
+ connection1.oldVersion = e.oldVersion;
+ connection1.newVersion = e.newVersion;
+ connection1.close();
+ }
+ secondPhase();
+ }
+ request.transaction.onabort = function()
+ {
+ debug("ALERT: " + "Version change transaction unexpected abort (firstPhase)");
+ done();
+ }
+ request.transaction.onerror = function()
+ {
+ debug("ALERT: " + "Version change transaction unexpected error (firstPhase)");
+ done();
+ }
+}
+
+function secondPhase()
+{
+ var request = window.indexedDB.open("VersionChangeTestDatabase", 1);
+ request.onsuccess = function()
+ {
+ debug("ALERT: " + "Open success (secondPhase)");
+ connection2 = request.result;
+ connection2.onversionchange = function(e)
+ {
+ connection2.oldVersion = e.oldVersion;
+ connection2.newVersion = e.newVersion;
+ connection2.close();
+ }
+ thirdPhase();
+ }
+ request.onerror = function(e)
+ {
+ debug("ALERT: " + "Unexpected open error (secondPhase)" + e);
+ done();
+ }
+ request.onupgradeneeded = function(e)
+ {
+ debug("ALERT: " + "Unexpected upgrade needed (secondPhase)");
+ done();
+ }
+}
+
+function thirdPhase()
+{
+ var request = window.indexedDB.open("VersionChangeTestDatabase", 2);
+ debug("ALERT: " + "thirdPhase - Requested database connection with version 2");
+ request.onsuccess = function()
+ {
+ debug("ALERT: " + "Version change to version 2 successful");
+ }
+ request.onerror = function(e)
+ {
+ debug("ALERT: " + "Unexpected open error (thirdPhase)" + e);
+ done();
+ }
+ request.onupgradeneeded = function(e)
+ {
+ debug("ALERT: " + "Expected upgrade needed (thirdPhase)");
+ debug("ALERT: " + "firstPhase connection had received oldVersion: " + connection1.oldVersion + ", newVersion: " + connection1.newVersion);
+ debug("ALERT: " + "secondPhase connection had received oldVersion: " + connection2.oldVersion + ", newVersion: " + connection2.newVersion);
+
+ done();
+ }
+}
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderntransactionscheduler1expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/transaction-scheduler-1-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/transaction-scheduler-1-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/transaction-scheduler-1-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,3 +1,8 @@
</span><ins>+This test makes sure that two read-only transactions to an object store are active at the same time.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> ALERT: Upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> ALERT: versionchange transaction completed
</span><span class="cx"> ALERT: Success opening database connection - request 1
</span><span class="lines">@@ -3,4 +8,6 @@
</span><span class="cx"> ALERT: Success opening database connection - request 2
</span><span class="cx"> ALERT: Two transactions open at once. Yay.
</span><del>-ALERT: Done
-This test makes sure that two read-only transactions to an object store are active at the same time.
</del><ins>+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderntransactionscheduler1html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/transaction-scheduler-1.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/transaction-scheduler-1.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/transaction-scheduler-1.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,120 +1,9 @@
</span><del>-This test makes sure that two read-only transactions to an object store are active at the same time.
-<script>
-
-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- alert("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-var createRequest = window.indexedDB.open("TransactionScheduler1Database");
-
-createRequest.onupgradeneeded = function(event) {
- alert("Upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- var database = event.target.result;
- var objectStore = database.createObjectStore("TestObjectStore");
- var request = objectStore.put("foo", "bar");
-
- request.onerror = function(event) {
- alert("put FAILED - " + event);
- done();
- }
-
- versionTransaction.onabort = function(event) {
- alert("versionchange transaction aborted");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- alert("versionchange transaction completed");
- continueTest();
- database.close();
- }
-
- versionTransaction.onerror = function(event) {
- alert("versionchange transaction error'ed - " + event);
- done();
- }
-}
-
-function continueTest()
-{
- var request1 = window.indexedDB.open("TransactionScheduler1Database", 1);
- var request2 = window.indexedDB.open("TransactionScheduler1Database", 1);
-
- setupRequest(request1, "request 1");
- setupRequest(request2, "request 2");
-}
-
-function setupRequest(request, reqName)
-{
- request.onsuccess = function(event) {
- alert("Success opening database connection - " + reqName);
- var database = event.target.result;
-
- startTransactionLoop(event.target.result.transaction("TestObjectStore", "readonly"), true);
- }
- request.onerror = function(event) {
- alert("Unexpected error - " + reqName + " - " + event);
- done();
- }
- request.onblocked = function(event) {
- alert("Unexpected blocked - " + reqName + " - " + event);
- done();
- }
- request.onupgradeneeded = function(event) {
- alert("Unexpected upgradeneeded - " + reqName + " - " + event);
- done();
- }
-}
-
-var numberOfOpenTransactions = 0;
-
-function startTransactionLoop(transaction, isFirstTime)
-{
- var objectStore = transaction.objectStore("TestObjectStore");
- var request = objectStore.get("bar");
-
- request.onsuccess = function(event) {
- if (isFirstTime)
- numberOfOpenTransactions++;
-
- if (numberOfOpenTransactions == 2) {
- alert("Two transactions open at once. Yay.");
- done();
- }
- startTransactionLoop(event.target.transaction, false);
- }
-
- request.onerror = function(event) {
- alert("Unexpected request error - " + event);
- done();
- }
-
- transaction.onerror = function(event) {
- alert("Unexpected transaction error - " + event);
- done();
- }
-
- transaction.onabort = function(event) {
- --numberOfOpenTransactions;
- alert("Unexpected transaction abort - " + event);
- done();
- }
-
- transaction.oncomplete = function(event) {
- --numberOfOpenTransactions;
- alert("Unexpected transaction complete - " + event);
- done();
- }
-}
-
-</script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
+<script src="resources/transaction-scheduler-1.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderntransactionscheduler2expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/transaction-scheduler-2-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/transaction-scheduler-2-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/transaction-scheduler-2-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,3 +1,8 @@
</span><ins>+This test makes sure that two read-only transactions to two different object stores are active at the same time.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> ALERT: Upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> ALERT: versionchange transaction completed
</span><span class="cx"> ALERT: Success opening database connection - Starting transaction to ObjectStore OS1
</span><span class="lines">@@ -3,4 +8,6 @@
</span><span class="cx"> ALERT: Success opening database connection - Starting transaction to ObjectStore OS2
</span><span class="cx"> ALERT: Two transactions open at once. Yay.
</span><del>-ALERT: Done
-This test makes sure that two read-only transactions to two different object stores are active at the same time.
</del><ins>+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderntransactionscheduler2html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/transaction-scheduler-2.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/transaction-scheduler-2.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/transaction-scheduler-2.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,126 +1,9 @@
</span><del>-This test makes sure that two read-only transactions to two different object stores are active at the same time.
-<script>
-
-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- alert("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-var createRequest = window.indexedDB.open("TransactionScheduler2Database");
-
-createRequest.onupgradeneeded = function(event) {
- alert("Upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- var database = event.target.result;
- var objectStore = database.createObjectStore("OS1");
- var request = objectStore.put("foo1", "bar1");
-
- request.onerror = function(event) {
- alert("put1 FAILED - " + event);
- done();
- }
-
- objectStore = database.createObjectStore("OS2");
- request = objectStore.put("foo2", "bar2");
-
- request.onerror = function(event) {
- alert("put2 FAILED - " + event);
- done();
- }
-
- versionTransaction.onabort = function(event) {
- alert("versionchange transaction aborted");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- alert("versionchange transaction completed");
- continueTest();
- database.close();
- }
-
- versionTransaction.onerror = function(event) {
- alert("versionchange transaction error'ed - " + event);
- done();
- }
-}
-
-function continueTest()
-{
- var request1 = window.indexedDB.open("TransactionScheduler2Database", 1);
- var request2 = window.indexedDB.open("TransactionScheduler2Database", 1);
-
- setupRequest(request1, "OS1");
- setupRequest(request2, "OS2");
-}
-
-function setupRequest(request, osname)
-{
- request.onsuccess = function(event) {
- alert("Success opening database connection - Starting transaction to ObjectStore " + osname);
- startTransactionLoop(event.target.result.transaction(osname, "readonly"), osname, true);
- }
- request.onerror = function(event) {
- alert("Unexpected error - " + osname + " - " + event);
- done();
- }
- request.onblocked = function(event) {
- alert("Unexpected blocked - " + osname + " - " + event);
- done();
- }
- request.onupgradeneeded = function(event) {
- alert("Unexpected upgradeneeded - " + osname + " - " + event);
- done();
- }
-}
-
-var numberOfOpenTransactions = 0;
-
-function startTransactionLoop(transaction, osname, isFirstTime)
-{
- var objectStore = transaction.objectStore(osname);
- var request = objectStore.get("bar");
-
- request.onsuccess = function(event) {
- if (isFirstTime)
- numberOfOpenTransactions++;
-
- if (numberOfOpenTransactions == 2) {
- alert("Two transactions open at once. Yay.");
- done();
- }
- startTransactionLoop(event.target.transaction, osname, false);
- }
-
- request.onerror = function(event) {
- alert("Unexpected request error - " + event);
- done();
- }
-
- transaction.onerror = function(event) {
- alert("Unexpected transaction error - " + event);
- done();
- }
-
- transaction.onabort = function(event) {
- --numberOfOpenTransactions;
- alert("Unexpected transaction abort - " + event);
- done();
- }
-
- transaction.oncomplete = function(event) {
- --numberOfOpenTransactions;
- alert("Unexpected transaction complete - " + event);
- done();
- }
-}
-
-</script>
</del><span class="cx">\ No newline at end of file
</span><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
+<script src="resources/transaction-scheduler-2.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderntransactionscheduler3expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/transaction-scheduler-3-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/transaction-scheduler-3-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/transaction-scheduler-3-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,3 +1,8 @@
</span><ins>+This test makes sure that a write transaction is blocked by a read transaction with overlapping scope. It also makes sure the write transaction starts after the read transaction completes.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> ALERT: Upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> ALERT: versionchange transaction completed
</span><span class="cx"> ALERT: Success opening database connection - Starting readonly transaction
</span><span class="lines">@@ -5,7 +10,7 @@
</span><span class="cx"> ALERT: Read transaction complete - [object Event]
</span><span class="cx"> ALERT: Write transaction put success
</span><span class="cx"> ALERT: Write transaction complete - [object Event]
</span><del>-ALERT: Done
-This test makes sure that a write transaction is blocked by a read transaction with overlapping scope.
-It also makes sure the write transaction starts after the read transaction completes.
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderntransactionscheduler3html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/transaction-scheduler-3.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/transaction-scheduler-3.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/transaction-scheduler-3.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,142 +1,9 @@
</span><del>-This test makes sure that a write transaction is blocked by a read transaction with overlapping scope.<br>
-It also makes sure the write transaction starts after the read transaction completes.<br>
-<script>
-
-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- alert("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-var createRequest = window.indexedDB.open("TransactionScheduler3Database");
-
-createRequest.onupgradeneeded = function(event) {
- alert("Upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- var database = event.target.result;
- var objectStore = database.createObjectStore("OS");
- var request = objectStore.put("bar", "foo");
-
- request.onerror = function(event) {
- alert("put FAILED - " + event);
- done();
- }
-
- versionTransaction.onabort = function(event) {
- alert("versionchange transaction aborted");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- alert("versionchange transaction completed");
- continueTest();
- database.close();
- }
-
- versionTransaction.onerror = function(event) {
- alert("versionchange transaction error'ed - " + event);
- done();
- }
-}
-
-var secondDatabaseConnection;
-function continueTest()
-{
- var longRunningReadRequest = window.indexedDB.open("TransactionScheduler3Database", 1);
- longRunningReadRequest.onsuccess = function(event) {
- alert("Success opening database connection - Starting readonly transaction");
- secondDatabaseConnection = event.target.result;
- readTransactionLoop(secondDatabaseConnection.transaction("OS", "readonly"), true);
- }
- longRunningReadRequest.onerror = function(event) {
- alert("Long running read request unexpected error - " + event);
- done();
- }
- longRunningReadRequest.onblocked = function(event) {
- alert("Long running read request unexpected blocked - " + event);
- done();
- }
- longRunningReadRequest.onupgradeneeded = function(event) {
- alert("Long running read request unexpected upgradeneeded - " + event);
- done();
- }
-}
-
-var shouldEndReadTransaction = false;
-
-function readTransactionLoop(transaction, isFirstTime)
-{
- var objectStore = transaction.objectStore("OS");
- var request = objectStore.get("foo");
-
- request.onsuccess = function(event) {
- if (!shouldEndReadTransaction)
- readTransactionLoop(event.target.transaction, false);
-
- // Now that the read transaction is open, the write transaction can be started, but it will be blocked to start with.
- if (isFirstTime)
- startWriteTransaction()
- }
-
- request.onerror = function(event) {
- alert("Unexpected request error - " + event);
- done();
- }
-
- transaction.onerror = function(event) {
- alert("Unexpected transaction error - " + event);
- done();
- }
-
- transaction.onabort = function(event) {
- alert("Unexpected transaction abort - " + event);
- done();
- }
-
- transaction.oncomplete = function(event) {
- alert("Read transaction complete - " + event);
- }
-}
-
-function startWriteTransaction()
-{
- alert("Creating write transaction");
- var transaction = secondDatabaseConnection.transaction("OS", "readwrite");
- var objectStore = transaction.objectStore("OS");
- var request = objectStore.put("baz", "foo");
-
- setTimeout("shouldEndReadTransaction = true;", 0);
-
- request.onsuccess = function(event) {
- alert("Write transaction put success");
- }
-
- request.onerror = function(event) {
- alert("Write transaction put unexpected error - " + event);
- done();
- }
-
- transaction.onerror = function(event) {
- alert("Write transaction unexpected error - " + event);
- done();
- }
-
- transaction.onabort = function(event) {
- alert("Write transaction unexpected abort - " + event);
- done();
- }
-
- transaction.oncomplete = function(event) {
- alert("Write transaction complete - " + event);
- done();
- }
-}
-
-</script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
+<script src="resources/transaction-scheduler-3.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderntransactionscheduler5expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/transaction-scheduler-5-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/transaction-scheduler-5-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/transaction-scheduler-5-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,3 +1,8 @@
</span><ins>+This test creates two object stores. It then opens two long running read-only transactions, one per object store. It then opens a read-write transaction to both object stores. The read-only transactions both need to finish before the read-write transaction starts.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> ALERT: Upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> ALERT: versionchange transaction completed
</span><span class="cx"> ALERT: Success opening database connection - Starting transactions
</span><span class="lines">@@ -6,9 +11,7 @@
</span><span class="cx"> ALERT: Read transaction complete - [object Event]
</span><span class="cx"> ALERT: Write to OS1 successful
</span><span class="cx"> ALERT: Write to OS2 successful
</span><del>-ALERT: Done
-This test creates two object stores.
-It then opens two long running read-only transactions, one per object store.
-It then opens a read-write transaction to both object stores.
-The read-only transactions both need to finish before the read-write transaction starts.
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderntransactionscheduler5html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/transaction-scheduler-5.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/transaction-scheduler-5.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/transaction-scheduler-5.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,166 +1,9 @@
</span><del>-This test creates two object stores.<br>
-It then opens two long running read-only transactions, one per object store.<br>
-It then opens a read-write transaction to both object stores.<br>
-The read-only transactions both need to finish before the read-write transaction starts.<br>
-<script>
-
-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- alert("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-var createRequest = window.indexedDB.open("TransactionScheduler5Database");
-
-createRequest.onupgradeneeded = function(event) {
- alert("Upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- var database = event.target.result;
- var objectStore = database.createObjectStore("OS1");
- var request = objectStore.put("bar", "foo");
-
- request.onerror = function(event) {
- alert("first put FAILED - " + event);
- done();
- }
-
- objectStore = database.createObjectStore("OS2");
- request = objectStore.put("bar", "foo");
-
- request.onerror = function(event) {
- alert("second put FAILED - " + event);
- done();
- }
-
- versionTransaction.onabort = function(event) {
- alert("versionchange transaction aborted");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- alert("versionchange transaction completed");
- continueTest();
- database.close();
- }
-
- versionTransaction.onerror = function(event) {
- alert("versionchange transaction error'ed - " + event);
- done();
- }
-}
-
-var secondDatabaseConnection;
-var readWriteTransaction;
-
-function setupReadTransactionCallbacks(transaction)
-{
- transaction.onerror = function(event) {
- alert("Unexpected transaction error - " + event);
- done();
- }
-
- transaction.onabort = function(event) {
- alert("Unexpected transaction abort - " + event);
- done();
- }
-
- transaction.oncomplete = function(event) {
- alert("Read transaction complete - " + event);
- }
-
- transaction.hasDoneFirstRead = false;
-}
-
-function continueTest()
-{
- var openDBRequest = window.indexedDB.open("TransactionScheduler5Database", 1);
- openDBRequest.onsuccess = function(event) {
- alert("Success opening database connection - Starting transactions");
- secondDatabaseConnection = event.target.result;
-
- var transaction1 = secondDatabaseConnection.transaction("OS1", "readonly");
- setupReadTransactionCallbacks(transaction1);
- var transaction2 = secondDatabaseConnection.transaction("OS2", "readonly");
- setupReadTransactionCallbacks(transaction2);
-
- readTransactionLoop(transaction1, "OS1", false);
- readTransactionLoop(transaction2, "OS2", true);
- }
- openDBRequest.onerror = function(event) {
- alert("Long running read request unexpected error - " + event);
- done();
- }
- openDBRequest.onblocked = function(event) {
- alert("Long running read request unexpected blocked - " + event);
- done();
- }
- openDBRequest.onupgradeneeded = function(event) {
- alert("Long running read request unexpected upgradeneeded - " + event);
- done();
- }
-}
-
-var shouldEndReadTransaction = false;
-
-function readTransactionLoop(transaction, osname, shouldStartWrite)
-{
- var objectStore = transaction.objectStore(osname);
- var request = objectStore.get("foo");
-
- request.onsuccess = function(event) {
- if (shouldEndReadTransaction && transaction.hasDoneFirstRead)
- return;
-
- transaction.hasDoneFirstRead = true;
- readTransactionLoop(event.target.transaction, osname, false);
-
- if (shouldStartWrite)
- startWriteTransaction();
- }
-
- request.onerror = function(event) {
- alert("Unexpected request error - " + event);
- done();
- }
-}
-
-function startWriteTransaction()
-{
- alert("Starting write transaction");
- var transaction = secondDatabaseConnection.transaction(["OS1", "OS2"], "readwrite");
- var objectStore = transaction.objectStore("OS1");
- var request = objectStore.put("baz", "foo");
-
- shouldEndReadTransaction = true;
-
- request.onsuccess = function(event) {
- alert("Write to OS1 successful");
- }
-
- request.onerror = function(event) {
- alert("Write transaction put unexpected error - " + event);
- done();
- }
-
- objectStore = transaction.objectStore("OS2");
- request = objectStore.put("baz", "foo");
-
- request.onsuccess = function(event) {
- alert("Write to OS2 successful");
- done();
- }
-
- request.onerror = function(event) {
- alert("Write transaction put unexpected error - " + event);
- done();
- }
-}
-
-</script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
+<script src="resources/transaction-scheduler-5.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderntransactionscheduler6expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/transaction-scheduler-6-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/transaction-scheduler-6-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/transaction-scheduler-6-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,3 +1,8 @@
</span><ins>+This test starts two read-only transactions to an object store followed by a read-write transaction. It verifies that the read-write doesn't start until both read-onlys have finished.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> ALERT: Upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> ALERT: versionchange transaction completed
</span><span class="cx"> ALERT: Starting a readonly transaction
</span><span class="lines">@@ -6,7 +11,7 @@
</span><span class="cx"> ALERT: readonly transaction completed
</span><span class="cx"> ALERT: Write in readwrite transaction succeeded
</span><span class="cx"> ALERT: readwrite transaction completed
</span><del>-ALERT: Done
-This test starts two read-only transactions to an object store followed by a read-write transaction.
-It verifies that the read-write doesn't start until both read-onlys have finished.
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderntransactionscheduler6html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/transaction-scheduler-6.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/transaction-scheduler-6.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/transaction-scheduler-6.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,124 +1,9 @@
</span><del>-This test starts two read-only transactions to an object store followed by a read-write transaction.<br>
-It verifies that the read-write doesn't start until both read-onlys have finished.<br>
-<script>
-
-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- alert("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-var createRequest = window.indexedDB.open("TransactionScheduler6Database");
-var database;
-
-createRequest.onupgradeneeded = function(event) {
- alert("Upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- database = event.target.result;
- var objectStore = database.createObjectStore("TestObjectStore");
- var request = objectStore.put("foo", "bar");
-
- request.onerror = function(event) {
- alert("put FAILED - " + event);
- done();
- }
-
- versionTransaction.onabort = function(event) {
- alert("versionchange transaction aborted");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- alert("versionchange transaction completed");
- continueTest();
- }
-
- versionTransaction.onerror = function(event) {
- alert("versionchange transaction error'ed - " + event);
- done();
- }
-}
-
-function continueTest()
-{
- startTransactionLoop(database.transaction("TestObjectStore", "readonly"), true);
- startTransactionLoop(database.transaction("TestObjectStore", "readonly"), true);
-
- var transaction = database.transaction("TestObjectStore", "readwrite");
- var objectStore = transaction.objectStore("TestObjectStore");
- var request = objectStore.put("baz", "foo");
-
- request.onsuccess = function(event) {
- alert("Write in readwrite transaction succeeded");
- }
-
- request.onerror = function(event) {
- alert("Write in readwrite transaction unexpectedly failed");
- done();
- }
-
- transaction.onabort = function(event) {
- alert("readwrite transaction expectedly aborted");
- done();
- }
-
- transaction.oncomplete = function(event) {
- alert("readwrite transaction completed");
- done();
- }
-
- transaction.onerror = function(event) {
- alert("readwrite transaction error'ed - " + event);
- done();
- }
-}
-
-var numberOfOpenTransactions = 0;
-
-function startTransactionLoop(transaction, isFirstTime)
-{
- var objectStore = transaction.objectStore("TestObjectStore");
- var request = objectStore.get("bar");
-
- request.onsuccess = function(event) {
- if (isFirstTime) {
- alert("Starting a readonly transaction");
- numberOfOpenTransactions++;
- }
-
- if (numberOfOpenTransactions == 2)
- return;
-
- startTransactionLoop(event.target.transaction, false);
- }
-
- request.onerror = function(event) {
- alert("Unexpected request error - " + event);
- done();
- }
-
- transaction.onerror = function(event) {
- alert("Unexpected transaction error - " + event);
- done();
- }
-
- transaction.onabort = function(event) {
- --numberOfOpenTransactions;
- alert("Unexpected transaction abort - " + event);
- done();
- }
-
- transaction.oncomplete = function(event) {
- --numberOfOpenTransactions;
- alert("readonly transaction completed");
- }
-}
-
-</script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
+<script src="resources/transaction-scheduler-6.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmoderntransactionsstoponnavigationexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/transactions-stop-on-navigation-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/transactions-stop-on-navigation-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/transactions-stop-on-navigation-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,7 +1,2 @@
</span><del>-Makes sure transactions stop on navigation to a new page.
-If the previous page's transaction is blindly charging forward, this test will probably timeout.
-If the previous page's connection/transactions did not clean up properly, the delete request in this test will incorrectly be blocked.
-If every thing is peachy keen, the delete request in this test will correctly succeed.
-Delete request was successful.
-Done.
-
</del><ins>+Makes sure transactions stop on navigation to a new page. If the previous page's transaction is blindly charging forward, this test will probably timeout. If the previous page's connection/transactions did not clean up properly, the delete request in this test will incorrectly be blocked. If every thing is peachy keen, the delete request in this test will correctly succeed.
+Delete request was successful.Done.
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernversionchangeabortthenreopenexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/versionchange-abort-then-reopen-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/versionchange-abort-then-reopen-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/versionchange-abort-then-reopen-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,3 +1,8 @@
</span><ins>+This test opens a new database, then aborts the version change transaction. It then reopens the database, making sure it's a default, empty database, and changes the version successfully. It then reopens the database, upgrading it's version. It aborts this versionchange, as well. Finally it reopens the database again, upgrading its version, making sure things had reverted back to before the second aborted versionchange.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> ALERT: Initial upgrade needed: Old version - 0 New version - 1
</span><span class="cx"> ALERT: Initial upgrade versionchange transaction aborted
</span><span class="cx"> ALERT: Second upgrade needed: Old version - 0 New version - 1
</span><span class="lines">@@ -5,9 +10,7 @@
</span><span class="cx"> ALERT: Third upgrade needed: Old version - 1 New version - 2
</span><span class="cx"> ALERT: Third upgrade versionchange transaction aborted
</span><span class="cx"> ALERT: Fourth upgrade needed: Old version - 1 New version - 2
</span><del>-ALERT: Done
-This test opens a new database, then aborts the version change transaction.
-It then reopens the database, making sure it's a default, empty database, and changes the version successfully.
-It then reopens the database, upgrading it's version. It aborts this versionchange, as well.
-Finally it reopens the database again, upgrading its version, making sure things had reverted back to before the second aborted versionchange.
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernversionchangeabortthenreopenhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/versionchange-abort-then-reopen.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/versionchange-abort-then-reopen.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/versionchange-abort-then-reopen.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,113 +1,9 @@
</span><del>-This test opens a new database, then aborts the version change transaction.<br>
-It then reopens the database, making sure it's a default, empty database, and changes the version successfully.<br>
-It then reopens the database, upgrading it's version. It aborts this versionchange, as well.<br>
-Finally it reopens the database again, upgrading its version, making sure things had reverted back to before the second aborted versionchange.<br>
-<script>
-
-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- alert("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-var createRequest = window.indexedDB.open("VersionChangeAbortTestDatabase", 1);
-
-createRequest.onupgradeneeded = function(event) {
- alert("Initial upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- var database = event.target.result;
-
- versionTransaction.abort();
-
- versionTransaction.onabort = function(event) {
- alert("Initial upgrade versionchange transaction aborted");
- continueTest1();
- database.close();
- }
-
- versionTransaction.oncomplete = function(event) {
- alert("Initial upgrade versionchange transaction unexpected complete");
- done();
- }
-
- versionTransaction.onerror = function(event) {
- alert("Initial upgrade versionchange transaction error " + event);
- }
-}
-
-function continueTest1()
-{
- createRequest = window.indexedDB.open("VersionChangeAbortTestDatabase", 1);
-
- createRequest.onupgradeneeded = function(event) {
- alert("Second upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- var database = event.target.result;
-
- versionTransaction.onabort = function(event) {
- alert("Second upgrade versionchange transaction unexpected abort");
- done();
- }
-
- versionTransaction.oncomplete = function(event) {
- alert("Second upgrade versionchange transaction complete");
- continueTest2();
- database.close();
- }
-
- versionTransaction.onerror = function(event) {
- alert("Second upgrade versionchange transaction unexpected error" + event);
- done();
- }
- }
-}
-
-function continueTest2()
-{
- createRequest = window.indexedDB.open("VersionChangeAbortTestDatabase", 2);
-
- createRequest.onupgradeneeded = function(event) {
- alert("Third upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
-
- var versionTransaction = createRequest.transaction;
- var database = event.target.result;
-
- versionTransaction.abort();
-
- versionTransaction.onabort = function(event) {
- alert("Third upgrade versionchange transaction aborted");
- continueTest3();
- database.close();
- }
-
- versionTransaction.oncomplete = function(event) {
- alert("Third upgrade versionchange transaction unexpected complete");
- done();
- }
-
- versionTransaction.onerror = function(event) {
- alert("Third upgrade versionchange transaction error" + event);
- }
- }
-}
-
-function continueTest3()
-{
- createRequest = window.indexedDB.open("VersionChangeAbortTestDatabase", 2);
-
- createRequest.onupgradeneeded = function(event) {
- alert("Fourth upgrade needed: Old version - " + event.oldVersion + " New version - " + event.newVersion);
- var database = event.target.result;
- done();
- }
-}
-
-</script>
</del><span class="cx">\ No newline at end of file
</span><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
+<script src="resources/versionchange-abort-then-reopen.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernversionchangeeventexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/versionchange-event-expected.txt (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/versionchange-event-expected.txt 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/versionchange-event-expected.txt 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,3 +1,8 @@
</span><ins>+This test: -Opens a connection to a database at version 1, creating the database -Commits the version change transaction for that database -Opens a second connection to that database, requesting version 1 -Opens a third connection to that database, requesting version 2 -Makes sure the first and second connections get the versionchange event -Closes the first and second connections -Makes sure the versionchange transaction for the second connection starts successfully
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
</ins><span class="cx"> ALERT: upgradeneeded (firstPhase): old version - 0 new version - 1
</span><span class="cx"> ALERT: Version change complete (firstPhase). Database version is now - 1
</span><span class="cx"> ALERT: First version change successful
</span><span class="lines">@@ -6,13 +11,7 @@
</span><span class="cx"> ALERT: Expected upgrade needed (thirdPhase)
</span><span class="cx"> ALERT: firstPhase connection had received oldVersion: 1, newVersion: 2
</span><span class="cx"> ALERT: secondPhase connection had received oldVersion: 1, newVersion: 2
</span><del>-ALERT: Done
-This test:
--Opens a connection to a database at version 1, creating the database
--Commits the version change transaction for that database
--Opens a second connection to that database, requesting version 1
--Opens a third connection to that database, requesting version 2
--Makes sure the first and second connections get the versionchange event
--Closes the first and second connections
--Makes sure the versionchange transaction for the second connection starts successfully
</del><ins>+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernversionchangeeventhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/versionchange-event.html (195320 => 195321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/versionchange-event.html 2016-01-19 23:17:45 UTC (rev 195320)
+++ trunk/LayoutTests/storage/indexeddb/modern/versionchange-event.html 2016-01-19 23:41:11 UTC (rev 195321)
</span><span class="lines">@@ -1,116 +1,9 @@
</span><del>-This test:<br>
--Opens a connection to a database at version 1, creating the database<br>
--Commits the version change transaction for that database<br>
--Opens a second connection to that database, requesting version 1<br>
--Opens a third connection to that database, requesting version 2<br>
--Makes sure the first and second connections get the versionchange event<br>
--Closes the first and second connections<br>
--Makes sure the versionchange transaction for the second connection starts successfully<br>
-<script>
-
-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-function done()
-{
- alert("Done");
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-var request = window.indexedDB.open("VersionChangeTestDatabase");
-var connection1;
-var connection2;
-
-request.onsuccess = function()
-{
- alert("First version change successful");
-}
-request.onerror = function(e)
-{
- alert("Unexpected error (firstPhase)");
- done();
-}
-
-request.onupgradeneeded = function(e)
-{
- var database = event.target.result;
-
- alert("upgradeneeded (firstPhase): old version - " + e.oldVersion + " new version - " + e.newVersion);
- request.transaction.oncomplete = function()
- {
- alert("Version change complete (firstPhase). Database version is now - " + database.version);
-
- connection1 = database;
- connection1.onversionchange = function(e)
- {
- connection1.oldVersion = e.oldVersion;
- connection1.newVersion = e.newVersion;
- connection1.close();
- }
- secondPhase();
- }
- request.transaction.onabort = function()
- {
- alert("Version change transaction unexpected abort (firstPhase)");
- done();
- }
- request.transaction.onerror = function()
- {
- alert("Version change transaction unexpected error (firstPhase)");
- done();
- }
-}
-
-function secondPhase()
-{
- var request = window.indexedDB.open("VersionChangeTestDatabase", 1);
- request.onsuccess = function()
- {
- alert("Open success (secondPhase)");
- connection2 = request.result;
- connection2.onversionchange = function(e)
- {
- connection2.oldVersion = e.oldVersion;
- connection2.newVersion = e.newVersion;
- connection2.close();
- }
- thirdPhase();
- }
- request.onerror = function(e)
- {
- alert("Unexpected open error (secondPhase)" + e);
- done();
- }
- request.onupgradeneeded = function(e)
- {
- alert("Unexpected upgrade needed (secondPhase)");
- done();
- }
-}
-
-function thirdPhase()
-{
- var request = window.indexedDB.open("VersionChangeTestDatabase", 2);
- alert("thirdPhase - Requested database connection with version 2");
- request.onsuccess = function()
- {
- alert("Version change to version 2 successful");
- }
- request.onerror = function(e)
- {
- alert("Unexpected open error (thirdPhase)" + e);
- done();
- }
- request.onupgradeneeded = function(e)
- {
- alert("Expected upgrade needed (thirdPhase)");
- alert("firstPhase connection had received oldVersion: " + connection1.oldVersion + ", newVersion: " + connection1.newVersion);
- alert("secondPhase connection had received oldVersion: " + connection2.oldVersion + ", newVersion: " + connection2.newVersion);
-
- done();
- }
-}
-</script>
</del><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
+<script src="resources/versionchange-event.js"></script>
+</body>
+</html>
</ins></span></pre>
</div>
</div>
</body>
</html>