<!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>[191337] 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/191337">191337</a></dd>
<dt>Author</dt> <dd>calvaris@igalia.com</dd>
<dt>Date</dt> <dd>2015-10-20 03:07:36 -0700 (Tue, 20 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Streams API] Update readable-stream-templated tests to latest spec
https://bugs.webkit.org/show_bug.cgi?id=149668
Reviewed by Darin Adler.
* streams/reference-implementation/readable-stream-expected.txt: Updated expectations.
* streams/reference-implementation/readable-stream.html: Updated tests.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsstreamsreferenceimplementationreadablestreamtemplatedexpectedtxt">trunk/LayoutTests/streams/reference-implementation/readable-stream-templated-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstreamsreferenceimplementationreadablestreamtemplatedhtml">trunk/LayoutTests/streams/reference-implementation/readable-stream-templated.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (191336 => 191337)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-10-20 09:57:23 UTC (rev 191336)
+++ trunk/LayoutTests/ChangeLog 2015-10-20 10:07:36 UTC (rev 191337)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-10-20 Xabier Rodriguez Calvar <calvaris@igalia.com>
+
+ [Streams API] Update readable-stream-templated tests to latest spec
+ https://bugs.webkit.org/show_bug.cgi?id=149668
+
+ Reviewed by Darin Adler.
+
+ * streams/reference-implementation/readable-stream-expected.txt: Updated expectations.
+ * streams/reference-implementation/readable-stream.html: Updated tests.
+
</ins><span class="cx"> 2015-10-13 Sergio Villar Senin <svillar@igalia.com>
</span><span class="cx">
</span><span class="cx"> ASSERTION FAILED: computeMainAxisExtentForChild(child, MainOrPreferredSize, mainSize) in WebCore::RenderFlexibleBox::adjustChildSizeForMinAndMax
</span></span></pre></div>
<a id="trunkLayoutTestsstreamsreferenceimplementationreadablestreamtemplatedexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/streams/reference-implementation/readable-stream-templated-expected.txt (191336 => 191337)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/streams/reference-implementation/readable-stream-templated-expected.txt 2015-10-20 09:57:23 UTC (rev 191336)
+++ trunk/LayoutTests/streams/reference-implementation/readable-stream-templated-expected.txt 2015-10-20 10:07:36 UTC (rev 191337)
</span><span class="lines">@@ -9,8 +9,8 @@
</span><span class="cx"> PASS read() should return distinct promises each time
</span><span class="cx"> PASS getReader() again on the stream should fail
</span><span class="cx"> PASS releasing the lock with pending read requests should throw but the read requests should stay pending
</span><del>-PASS releasing the lock should cause further read() calls to resolve as if the stream is closed
-PASS releasing the lock should cause closed to fulfill
</del><ins>+TIMEOUT releasing the lock should cause further read() calls to reject with a TypeError Test timed out
+TIMEOUT releasing the lock should cause closed to reject Test timed out
</ins><span class="cx"> PASS releasing the lock should cause locked to become false
</span><span class="cx"> PASS canceling via the reader should cause the reader to act closed
</span><span class="cx"> PASS canceling via the stream should fail
</span><span class="lines">@@ -20,18 +20,21 @@
</span><span class="cx"> PASS getReader() should be OK
</span><span class="cx"> FAIL piping to a WritableStream in the writable state should close the writable stream WritableStream constructor not implemented
</span><span class="cx"> FAIL piping to a WritableStream in the writable state with { preventClose: true } should do nothing WritableStream constructor not implemented
</span><del>-PASS should be able to acquire multiple readers, since they are all auto-released
</del><ins>+PASS should be able to acquire multiple readers if they are released in succession
+FAIL should not be able to acquire a second reader if we don't release the first one assert_throws: getting a second reader should throw function "function () { rs.getReader(); }" did not throw
</ins><span class="cx"> PASS Running templatedRSClosedReader with ReadableStream reader (closed before getting reader)
</span><span class="cx"> PASS read() should fulfill with { value: undefined, done: true }
</span><span class="cx"> PASS read() multiple times should fulfill with { value: undefined, done: true }
</span><span class="cx"> PASS read() should work when used within another read() fulfill callback
</span><span class="cx"> PASS closed should fulfill with undefined
</span><ins>+FAIL releasing the lock should cause closed to reject and change identity assert_not_equals: the closed promise should change identity got disallowed value object "[object Promise]"
</ins><span class="cx"> PASS cancel() should return a distinct fulfilled promise each time
</span><span class="cx"> PASS Running templatedRSClosedReader with ReadableStream reader (closed after getting reader)
</span><span class="cx"> PASS read() should fulfill with { value: undefined, done: true }
</span><span class="cx"> PASS read() multiple times should fulfill with { value: undefined, done: true }
</span><span class="cx"> PASS read() should work when used within another read() fulfill callback
</span><span class="cx"> PASS closed should fulfill with undefined
</span><ins>+FAIL releasing the lock should cause closed to reject and change identity assert_not_equals: the closed promise should change identity got disallowed value object "[object Promise]"
</ins><span class="cx"> PASS cancel() should return a distinct fulfilled promise each time
</span><span class="cx"> PASS Running templatedRSClosed with ReadableStream (closed via cancel)
</span><span class="cx"> PASS cancel() should return a distinct fulfilled promise each time
</span><span class="lines">@@ -39,12 +42,14 @@
</span><span class="cx"> PASS getReader() should be OK
</span><span class="cx"> FAIL piping to a WritableStream in the writable state should close the writable stream WritableStream constructor not implemented
</span><span class="cx"> FAIL piping to a WritableStream in the writable state with { preventClose: true } should do nothing WritableStream constructor not implemented
</span><del>-PASS should be able to acquire multiple readers, since they are all auto-released
</del><ins>+PASS should be able to acquire multiple readers if they are released in succession
+FAIL should not be able to acquire a second reader if we don't release the first one assert_throws: getting a second reader should throw function "function () { rs.getReader(); }" did not throw
</ins><span class="cx"> PASS Running templatedRSClosedReader with ReadableStream reader (closed via cancel after getting reader)
</span><span class="cx"> PASS read() should fulfill with { value: undefined, done: true }
</span><span class="cx"> PASS read() multiple times should fulfill with { value: undefined, done: true }
</span><span class="cx"> PASS read() should work when used within another read() fulfill callback
</span><span class="cx"> PASS closed should fulfill with undefined
</span><ins>+FAIL releasing the lock should cause closed to reject and change identity assert_not_equals: the closed promise should change identity got disallowed value object "[object Promise]"
</ins><span class="cx"> PASS cancel() should return a distinct fulfilled promise each time
</span><span class="cx"> PASS Running templatedRSErrored with ReadableStream (errored via call in start)
</span><span class="cx"> FAIL piping to a WritableStream in the writable state should abort the writable stream WritableStream constructor not implemented
</span><span class="lines">@@ -53,9 +58,9 @@
</span><span class="cx"> PASS locked should be false
</span><span class="cx"> PASS Running templatedRSErroredSyncOnly with ReadableStream (errored via call in start)
</span><span class="cx"> PASS should be able to obtain a second reader, with the correct closed promise
</span><ins>+FAIL should not be able to obtain additional readers if we don't release the first lock assert_throws: getting a second reader should throw a TypeError function "function () { rs.getReader(); }" did not throw
</ins><span class="cx"> PASS cancel() should return a distinct rejected promise each time
</span><span class="cx"> PASS reader cancel() should return a distinct rejected promise each time
</span><del>-PASS should be able to acquire multiple readers, since they are all auto-released
</del><span class="cx"> PASS Running templatedRSErrored with ReadableStream (errored via returning a rejected promise in start)
</span><span class="cx"> FAIL piping to a WritableStream in the writable state should abort the writable stream WritableStream constructor not implemented
</span><span class="cx"> PASS getReader() should return a reader that acts errored
</span><span class="lines">@@ -67,12 +72,15 @@
</span><span class="cx"> FAIL piping with { preventAbort: true } WritableStream constructor not implemented
</span><span class="cx"> PASS Running templatedRSErroredReader with ReadableStream (errored via returning a rejected promise in start) reader
</span><span class="cx"> PASS closed should reject with the error
</span><ins>+FAIL releasing the lock should cause closed to reject and change identity assert_not_equals: the closed promise should change identity got disallowed value object "[object Promise]"
</ins><span class="cx"> PASS read() should reject with the error
</span><span class="cx"> PASS Running templatedRSErroredReader with ReadableStream reader (errored before getting reader)
</span><span class="cx"> PASS closed should reject with the error
</span><ins>+FAIL releasing the lock should cause closed to reject and change identity assert_not_equals: the closed promise should change identity got disallowed value object "[object Promise]"
</ins><span class="cx"> PASS read() should reject with the error
</span><span class="cx"> PASS Running templatedRSErroredReader with ReadableStream reader (errored after getting reader)
</span><span class="cx"> PASS closed should reject with the error
</span><ins>+FAIL releasing the lock should cause closed to reject and change identity assert_not_equals: the closed promise should change identity got disallowed value object "[object Promise]"
</ins><span class="cx"> PASS read() should reject with the error
</span><span class="cx"> PASS Running templatedRSTwoChunksOpenReader with ReadableStream (two chunks enqueued, still open) reader
</span><span class="cx"> PASS calling read() twice without waiting will eventually give both chunks
</span><span class="lines">@@ -103,8 +111,8 @@
</span><span class="cx"> PASS Running templatedRSTwoChunksClosedReader with ReadableStream (two chunks enqueued, then closed) reader
</span><span class="cx"> PASS third read(), without waiting, should give { value: undefined, done: true }
</span><span class="cx"> PASS third read, with waiting, should give { value: undefined, done: true }
</span><del>-PASS draining the stream via read() should cause the reader closed promise to fulfill and locked to be false
-PASS releasing the lock after the stream is closed should do nothing
-PASS releasing the lock should cause read() to act as if the stream is closed
</del><ins>+FAIL draining the stream via read() should cause the reader closed promise to fulfill, but locked stays true assert_true: stream should remain locked expected true got false
+FAIL releasing the lock after the stream is closed should cause locked to become false assert_true: the stream should start locked expected true got false
+TIMEOUT releasing the lock should cause further read() calls to reject with a TypeError Test timed out
</ins><span class="cx"> PASS reader's closed property always returns the same promise
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsstreamsreferenceimplementationreadablestreamtemplatedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/streams/reference-implementation/readable-stream-templated.html (191336 => 191337)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/streams/reference-implementation/readable-stream-templated.html 2015-10-20 09:57:23 UTC (rev 191336)
+++ trunk/LayoutTests/streams/reference-implementation/readable-stream-templated.html 2015-10-20 10:07:36 UTC (rev 191337)
</span><span class="lines">@@ -3,6 +3,8 @@
</span><span class="cx"> <script src='../../resources/testharnessreport.js'></script>
</span><span class="cx"> <script src='resources/streams-utils.js'></script>
</span><span class="cx"> <script>
</span><ins>+// This is updated till https://github.com/whatwg/streams/commit/ec5ffa036308d9f6350d2946560d48cdbf090939
+
</ins><span class="cx"> function templatedRSEmpty(label, factory) {
</span><span class="cx"> test(function() {
</span><span class="cx"> }, 'Running templatedRSEmpty with ' + label);
</span><span class="lines">@@ -124,11 +126,23 @@
</span><span class="cx"> test(function() {
</span><span class="cx"> var rs = factory();
</span><span class="cx">
</span><ins>+ var reader = rs.getReader();
+ reader.releaseLock();
+
+ reader = rs.getReader(); // Getting a second reader should not throw.
+ reader.releaseLock();
+
+ rs.getReader(); // Getting a third reader should not throw.
+ }, 'should be able to acquire multiple readers if they are released in succession');
+
+ test(function() {
+ var rs = factory();
+
</ins><span class="cx"> rs.getReader();
</span><span class="cx">
</span><del>- rs.getReader(); // Getting a second reader should not throw.
- rs.getReader(); // Getting a third reader should not throw.
- }, 'should be able to acquire multiple readers, since they are all auto-released');
</del><ins>+ assert_throws(new TypeError(), function() { rs.getReader(); }, 'getting a second reader should throw');
+ assert_throws(new TypeError(), function() { rs.getReader(); }, 'getting a third reader should throw');
+ }, 'should not be able to acquire a second reader if we don\'t release the first one');
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> function templatedRSErrored(label, factory, error) {
</span><span class="lines">@@ -300,7 +314,7 @@
</span><span class="cx"> test1.step(function() {
</span><span class="cx"> var rs = factory();
</span><span class="cx">
</span><del>- rs.getReader();
</del><ins>+ rs.getReader().releaseLock();
</ins><span class="cx">
</span><span class="cx"> var reader = rs.getReader(); // Calling getReader() twice does not throw (the stream is not locked).
</span><span class="cx">
</span><span class="lines">@@ -313,6 +327,15 @@
</span><span class="cx"> );
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+ test(function() {
+ var rs = factory();
+
+ rs.getReader();
+
+ assert_throws(new TypeError(), function() { rs.getReader(); }, 'getting a second reader should throw a TypeError');
+ assert_throws(new TypeError(), function() { rs.getReader(); }, 'getting a third reader should throw a TypeError');
+ }, 'should not be able to obtain additional readers if we don\'t release the first lock');
+
</ins><span class="cx"> var test2 = async_test('cancel() should return a distinct rejected promise each time');
</span><span class="cx"> test2.step(function() {
</span><span class="cx"> var rs = factory();
</span><span class="lines">@@ -359,15 +382,6 @@
</span><span class="cx"> assert_not_equals(cancelPromise1, cancelPromise2, 'cancel() calls should return distinct promises');
</span><span class="cx"> allChecked = true;
</span><span class="cx"> });
</span><del>-
- test(function() {
- var rs = factory();
-
- rs.getReader();
-
- rs.getReader(); // Getting a second reader should not throw.
- rs.getReader(); // Getting a third reader should not throw.
- }, 'should be able to acquire multiple readers, since they are all auto-released');
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> function templatedRSTwoChunksClosed(label, factory, error) {
</span><span class="lines">@@ -592,7 +606,7 @@
</span><span class="cx">
</span><span class="cx"> var test3 = async_test('releasing the lock with pending read requests should throw but the read requests should stay pending');
</span><span class="cx"> test3.step(function() {
</span><del>- var { reader } = factory();
</del><ins>+ var { stream, reader } = factory();
</ins><span class="cx">
</span><span class="cx"> reader.read().then(
</span><span class="cx"> test3.step_func(function() { assert_unreached('first read() should not fulfill'); }),
</span><span class="lines">@@ -611,42 +625,40 @@
</span><span class="cx">
</span><span class="cx"> assert_throws(new TypeError(), function() { reader.releaseLock(); }, 'releaseLock should throw a TypeError');
</span><span class="cx">
</span><ins>+ assert_true(stream.locked, 'the stream should still be locked');
+
</ins><span class="cx"> setTimeout(test3.step_func(function() { test3.done(); }), 1000);
</span><span class="cx"> });
</span><span class="cx">
</span><del>- var test4 = async_test('releasing the lock should cause further read() calls to resolve as if the stream is closed');
</del><ins>+ var test4 = async_test('releasing the lock should cause further read() calls to reject with a TypeError', { timeout: 50 });
</ins><span class="cx"> test4.step(function() {
</span><ins>+ var promiseCalls = 0;
</ins><span class="cx"> var { reader } = factory();
</span><del>- var promisesCount = 0;
</del><span class="cx">
</span><span class="cx"> reader.releaseLock();
</span><span class="cx">
</span><del>- reader.read().then(test4.step_func(function(r) {
- assert_object_equals(r, { value: undefined, done: true }, 'first read() should return closed result');
- ++promisesCount;
</del><ins>+ reader.read().catch(test4.step_func(function(e) {
+ assert_throws(new TypeError(), function() { throw e; }, 'first read() should reject with a TypeError');
+ assert_equals(++promiseCalls, 1);
</ins><span class="cx"> }));
</span><del>- reader.read().then(test4.step_func(function(r) {
- assert_object_equals(r, { value: undefined, done: true }, 'second read() should return closed result');
- assert_equals(++promisesCount, 2);
</del><ins>+ reader.read().catch(test4.step_func(function(e) {
+ assert_throws(new TypeError(), function() { throw e; }, 'second read() should reject with a TypeError');
+ assert_equals(++promiseCalls, 2);
</ins><span class="cx"> test4.done();
</span><span class="cx"> }));
</span><span class="cx"> });
</span><span class="cx">
</span><del>- var test5 = async_test('releasing the lock should cause closed to fulfill');
</del><ins>+ var test5 = async_test('releasing the lock should cause closed to reject', { timeout: 50 });
</ins><span class="cx"> test5.step(function() {
</span><span class="cx"> var { reader } = factory();
</span><del>- var promisesCount = 0;
</del><span class="cx">
</span><del>- reader.closed.then(test5.step_func(function(v) {
- assert_equals(v, undefined, 'reader.closed got before release should fulfill with undefined');
- ++promisesCount;
- }));
-
</del><ins>+ var closedBefore = reader.closed;
</ins><span class="cx"> reader.releaseLock();
</span><ins>+ var closedAfter = reader.closed;
</ins><span class="cx">
</span><del>- reader.closed.then(test5.step_func(function(v) {
- assert_equals(v, undefined, 'reader.closed got after release should fulfill with undefined');
- assert_equals(++promisesCount, 2);
</del><ins>+ assert_equals(closedBefore, closedAfter, 'the closed promise should not change identity')
+ closedBefore.catch(test5.step_func(function(e) {
+ assert_throws(new TypeError(), function() { throw e; }, 'reader.closed should reject with a TypeError');
</ins><span class="cx"> test5.done();
</span><span class="cx"> }));
</span><span class="cx"> });
</span><span class="lines">@@ -739,9 +751,30 @@
</span><span class="cx"> );
</span><span class="cx"> });
</span><span class="cx">
</span><del>- var test5 = async_test('cancel() should return a distinct fulfilled promise each time');
</del><ins>+ var test5 = async_test('releasing the lock should cause closed to reject and change identity');
</ins><span class="cx"> test5.step(function() {
</span><ins>+ var promiseCalls = 0;
</ins><span class="cx"> var { reader } = factory();
</span><ins>+
+ var closedBefore = reader.closed;
+ reader.releaseLock();
+ var closedAfter = reader.closed;
+
+ assert_not_equals(closedBefore, closedAfter, 'the closed promise should change identity')
+ closedBefore.then(test5.step_func(function(v) {
+ assert_equals(v, undefined, 'reader.closed acquired before release should fulfill');
+ assert_equals(++promiseCalls, 1);
+ }));
+ closedAfter.catch(test5.step_func(function(e) {
+ assert_throws(new TypeError(), function() { throw e; }, 'reader.closed acquired after release should reject with a TypeError');
+ assert_equals(++promiseCalls, 2);
+ test5.done();
+ }));
+ });
+
+ var test6 = async_test('cancel() should return a distinct fulfilled promise each time');
+ test6.step(function() {
+ var { reader } = factory();
</ins><span class="cx"> var promiseCount = 0;
</span><span class="cx"> var allChecked = false;
</span><span class="cx">
</span><span class="lines">@@ -749,15 +782,15 @@
</span><span class="cx"> var cancelPromise2 = reader.cancel();
</span><span class="cx"> var closedReaderPromise = reader.closed;
</span><span class="cx">
</span><del>- cancelPromise1.then(test5.step_func(function(v) {
</del><ins>+ cancelPromise1.then(test6.step_func(function(v) {
</ins><span class="cx"> assert_equals(v, undefined, 'first cancel() call should fulfill with undefined');
</span><span class="cx"> ++promiseCount;
</span><span class="cx"> }));
</span><del>- cancelPromise2.then(test5.step_func(function(v) {
</del><ins>+ cancelPromise2.then(test6.step_func(function(v) {
</ins><span class="cx"> assert_equals(v, undefined, 'second cancel() call should fulfill with undefined');
</span><span class="cx"> assert_equals(++promiseCount, 2);
</span><span class="cx"> assert_true(allChecked);
</span><del>- test5.done();
</del><ins>+ test6.done();
</ins><span class="cx"> }));
</span><span class="cx"> assert_not_equals(cancelPromise1, cancelPromise2, 'cancel() calls should return distinct promises');
</span><span class="cx"> assert_not_equals(cancelPromise1, closedReaderPromise, 'cancel() promise 1 should be distinct from reader.closed');
</span><span class="lines">@@ -783,17 +816,38 @@
</span><span class="cx"> );
</span><span class="cx"> });
</span><span class="cx">
</span><del>- var test2 = async_test('read() should reject with the error');
</del><ins>+ var test2 = async_test('releasing the lock should cause closed to reject and change identity');
</ins><span class="cx"> test2.step(function() {
</span><span class="cx"> var { reader } = factory();
</span><span class="cx">
</span><ins>+ var closedBefore = reader.closed;
+
+ closedBefore.catch(test2.step_func(function(e) {
+ assert_equals(e, error, 'reader.closed acquired before release should reject with the error');
+
+ reader.releaseLock();
+ var closedAfter = reader.closed;
+
+ assert_not_equals(closedBefore, closedAfter, 'the closed promise should change identity');
+
+ return closedAfter.catch(test2.step_func(function(e) {
+ assert_throws(new TypeError(), function() { throw e; }, 'reader.closed acquired after release should reject with a TypeError');
+ test2.done();
+ }));
+ })).catch(test2.step_func(function(e) { assert_unreached(e); }));
+ });
+
+ var test3 = async_test('read() should reject with the error');
+ test3.step(function() {
+ var { reader } = factory();
+
</ins><span class="cx"> reader.read().then(
</span><del>- test2.step_func(function() {
</del><ins>+ test3.step_func(function() {
</ins><span class="cx"> assert_unreached('read() should not fulfill');
</span><span class="cx"> }),
</span><del>- test2.step_func(function(r) {
</del><ins>+ test3.step_func(function(r) {
</ins><span class="cx"> assert_equals(r, error, 'read() should reject with the error');
</span><del>- test2.done();
</del><ins>+ test3.done();
</ins><span class="cx"> })
</span><span class="cx"> );
</span><span class="cx"> });
</span><span class="lines">@@ -906,16 +960,16 @@
</span><span class="cx"> })).catch(test2.step_func(function(e) { assert_unreached(e); }));
</span><span class="cx"> });
</span><span class="cx">
</span><del>- var test3 = async_test('draining the stream via read() should cause the reader closed promise to fulfill and locked to be false');
</del><ins>+ var test3 = async_test('draining the stream via read() should cause the reader closed promise to fulfill, but locked stays true');
</ins><span class="cx"> test3.step(function() {
</span><span class="cx"> var { stream, reader } = factory();
</span><del>- var readCalled = false;
</del><span class="cx">
</span><ins>+ assert_true(stream.locked, 'stream should start locked');
+
</ins><span class="cx"> reader.closed.then(
</span><span class="cx"> test3.step_func(function(v) {
</span><del>- assert_true(readCalled);
</del><span class="cx"> assert_equals(v, undefined, 'reader closed should fulfill with undefined');
</span><del>- assert_false(stream.locked, 'stream should no longer be locked');
</del><ins>+ assert_true(stream.locked, 'stream should remain locked');
</ins><span class="cx"> test3.done();
</span><span class="cx"> }),
</span><span class="cx"> test3.step_func(function() { assert_unreached('reader closed should not reject'); })
</span><span class="lines">@@ -923,45 +977,43 @@
</span><span class="cx">
</span><span class="cx"> reader.read();
</span><span class="cx"> reader.read();
</span><del>- readCalled = true;
</del><span class="cx"> });
</span><span class="cx">
</span><del>- var test4 = async_test('releasing the lock after the stream is closed should do nothing');
</del><ins>+ var test4 = async_test('releasing the lock after the stream is closed should cause locked to become false');
</ins><span class="cx"> test4.step(function() {
</span><del>- var { reader } = factory();
- var readCalled = false;
</del><ins>+ var { stream, reader } = factory();
</ins><span class="cx">
</span><span class="cx"> reader.closed.then(test4.step_func(function() {
</span><del>- assert_true(readCalled);
</del><ins>+ assert_true(stream.locked, 'the stream should start locked');
</ins><span class="cx"> reader.releaseLock(); // Releasing the lock after reader closed should not throw.
</span><ins>+ assert_false(stream.locked, 'the stream should end unlocked');
</ins><span class="cx"> test4.done();
</span><span class="cx"> }));
</span><span class="cx">
</span><span class="cx"> reader.read();
</span><span class="cx"> reader.read();
</span><del>- readCalled = true;
</del><span class="cx"> });
</span><span class="cx">
</span><del>- var test5 = async_test('releasing the lock should cause read() to act as if the stream is closed');
</del><ins>+ var test5 = async_test('releasing the lock should cause further read() calls to reject with a TypeError', { timeout: 50});
</ins><span class="cx"> test5.step(function() {
</span><ins>+ var promiseCalls = 0;
</ins><span class="cx"> var { reader } = factory();
</span><del>- var promiseCalls = 0;
</del><span class="cx">
</span><span class="cx"> reader.releaseLock();
</span><span class="cx">
</span><del>- reader.read().then(test5.step_func(function(r) {
- assert_object_equals(r, { value: undefined, done: true }, 'first read() should return closed result');
- ++promiseCalls;
</del><ins>+ reader.read().catch(test5.step_func(function(e) {
+ assert_throws(new TypeError(), function() { throw e; }, 'first read() should reject with a TypeError');
+ assert_equals(++promiseCalls, 1);
</ins><span class="cx"> }));
</span><del>- reader.read().then(test5.step_func(function(r) {
- assert_object_equals(r, { value: undefined, done: true }, 'second read() should return closed result');
- ++promiseCalls;
</del><ins>+ reader.read().catch(test5.step_func(function(e) {
+ assert_throws(new TypeError(), function() { throw e; }, 'second read() should reject with a TypeError');
+ assert_equals(++promiseCalls, 2);
</ins><span class="cx"> }));
</span><del>- reader.read().then(test5.step_func(function(r) {
- assert_object_equals(r, { value: undefined, done: true }, 'third read() should return closed result');
</del><ins>+ reader.read().catch(test5.step_func(function(e) {
+ assert_throws(new TypeError(), function() { throw e; }, 'third read() should reject with a TypeError');
</ins><span class="cx"> assert_equals(++promiseCalls, 3);
</span><span class="cx"> test5.done();
</span><del>- }))
</del><ins>+ }));
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> var test6 = async_test('reader\'s closed property always returns the same promise');
</span></span></pre>
</div>
</div>
</body>
</html>