<!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>[191222] 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/191222">191222</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2015-10-16 16:15:12 -0700 (Fri, 16 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix flakey test that was added for:
Modern IDB: Add versionchange events.
https://bugs.webkit.org/show_bug.cgi?id=150149
Test flakes because two events come in different orders.
The event order actually does not matter.
The test just needs to handle either order.
* 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="#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>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (191221 => 191222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-10-16 22:53:11 UTC (rev 191221)
+++ trunk/LayoutTests/ChangeLog 2015-10-16 23:15:12 UTC (rev 191222)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-10-16 Brady Eidson <beidson@apple.com>
+
+ Fix flakey test that was added for:
+ Modern IDB: Add versionchange events.
+ https://bugs.webkit.org/show_bug.cgi?id=150149
+
+ Test flakes because two events come in different orders.
+
+ The event order actually does not matter.
+ The test just needs to handle either order.
+
+ * storage/indexeddb/modern/versionchange-event-expected.txt:
+ * storage/indexeddb/modern/versionchange-event.html:
+
</ins><span class="cx"> 2015-10-16 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Test fix after r191211
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernversionchangeeventexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/versionchange-event-expected.txt (191221 => 191222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/versionchange-event-expected.txt 2015-10-16 22:53:11 UTC (rev 191221)
+++ trunk/LayoutTests/storage/indexeddb/modern/versionchange-event-expected.txt 2015-10-16 23:15:12 UTC (rev 191222)
</span><span class="lines">@@ -2,9 +2,9 @@
</span><span class="cx"> ALERT: Version change complete (firstPhase). Database version is now - 1
</span><span class="cx"> ALERT: Open success (secondPhase)
</span><span class="cx"> ALERT: thirdPhase - Requested database connection with version 2
</span><del>-ALERT: secondPhase connection versionchange event - old version: 1, new version: 2
-ALERT: firstPhase connection versionchange event - old version: 1, new version: 2
</del><span class="cx"> ALERT: Expected upgrade needed (thirdPhase)
</span><ins>+ALERT: firstPhase connection had received oldVersion: 1, newVersion: 2
+ALERT: secondPhase connection had received oldVersion: 1, newVersion: 2
</ins><span class="cx"> ALERT: Done
</span><span class="cx"> This test:
</span><span class="cx"> -Opens a connection to a database at version 1, creating the database
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernversionchangeeventhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/storage/indexeddb/modern/versionchange-event.html (191221 => 191222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/versionchange-event.html 2015-10-16 22:53:11 UTC (rev 191221)
+++ trunk/LayoutTests/storage/indexeddb/modern/versionchange-event.html 2015-10-16 23:15:12 UTC (rev 191222)
</span><span class="lines">@@ -44,7 +44,8 @@
</span><span class="cx"> connection1 = request.transaction.db;
</span><span class="cx"> connection1.onversionchange = function(e)
</span><span class="cx"> {
</span><del>- alert("firstPhase connection versionchange event - old version: " + e.oldVersion + ", new version: " + e.newVersion);
</del><ins>+ connection1.oldVersion = e.oldVersion;
+ connection1.newVersion = e.newVersion;
</ins><span class="cx"> connection1.close();
</span><span class="cx"> }
</span><span class="cx"> secondPhase();
</span><span class="lines">@@ -70,7 +71,8 @@
</span><span class="cx"> connection2 = request.result;
</span><span class="cx"> connection2.onversionchange = function(e)
</span><span class="cx"> {
</span><del>- alert("secondPhase connection versionchange event - old version: " + e.oldVersion + ", new version: " + e.newVersion);
</del><ins>+ connection2.oldVersion = e.oldVersion;
+ connection2.newVersion = e.newVersion;
</ins><span class="cx"> connection2.close();
</span><span class="cx"> }
</span><span class="cx"> thirdPhase();
</span><span class="lines">@@ -104,6 +106,9 @@
</span><span class="cx"> request.onupgradeneeded = function(e)
</span><span class="cx"> {
</span><span class="cx"> alert("Expected upgrade needed (thirdPhase)");
</span><ins>+ alert("firstPhase connection had received oldVersion: " + connection1.oldVersion + ", newVersion: " + connection1.newVersion);
+ alert("secondPhase connection had received oldVersion: " + connection2.oldVersion + ", newVersion: " + connection2.newVersion);
+
</ins><span class="cx"> done();
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>