<!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>[191293] 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/191293">191293</a></dd>
<dt>Author</dt> <dd>calvaris@igalia.com</dd>
<dt>Date</dt> <dd>2015-10-19 09:36:44 -0700 (Mon, 19 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Streams API] Update readable-stream-reader tests to latest spec
https://bugs.webkit.org/show_bug.cgi?id=149699
Reviewed by Darin Adler.
* streams/reference-implementation/readable-stream-reader-expected.txt: Updated expectations.
* streams/reference-implementation/readable-stream-reader.html: Updated tests.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsstreamsreferenceimplementationreadablestreamreaderexpectedtxt">trunk/LayoutTests/streams/reference-implementation/readable-stream-reader-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstreamsreferenceimplementationreadablestreamreaderhtml">trunk/LayoutTests/streams/reference-implementation/readable-stream-reader.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (191292 => 191293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-10-19 16:34:44 UTC (rev 191292)
+++ trunk/LayoutTests/ChangeLog 2015-10-19 16:36:44 UTC (rev 191293)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2015-10-19 Xabier Rodriguez Calvar <calvaris@igalia.com>
</span><span class="cx">
</span><ins>+ [Streams API] Update readable-stream-reader tests to latest spec
+ https://bugs.webkit.org/show_bug.cgi?id=149699
+
+ Reviewed by Darin Adler.
+
+ * streams/reference-implementation/readable-stream-reader-expected.txt: Updated expectations.
+ * streams/reference-implementation/readable-stream-reader.html: Updated tests.
+
+2015-10-19 Xabier Rodriguez Calvar <calvaris@igalia.com>
+
</ins><span class="cx"> [Streams API] Update readable-stream-controller-error tests against latest reference
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=149700
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsstreamsreferenceimplementationreadablestreamreaderexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/streams/reference-implementation/readable-stream-reader-expected.txt (191292 => 191293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/streams/reference-implementation/readable-stream-reader-expected.txt 2015-10-19 16:34:44 UTC (rev 191292)
+++ trunk/LayoutTests/streams/reference-implementation/readable-stream-reader-expected.txt 2015-10-19 16:36:44 UTC (rev 191293)
</span><span class="lines">@@ -10,12 +10,12 @@
</span><span class="cx"> PASS Constructing a ReadableStreamReader directly should be OK if the stream is closed
</span><span class="cx"> PASS Constructing a ReadableStreamReader directly should be OK if the stream is errored
</span><span class="cx"> PASS Reading from a reader for an empty stream will wait until a chunk is available
</span><del>-PASS cancel() on a reader releases the reader before calling through
</del><ins>+FAIL cancel() on a reader does not release the reader assert_unreached: reader.cancel() should not reject Reached unreachable code
</ins><span class="cx"> PASS closed should be fulfilled after stream is closed (.closed access before acquiring)
</span><del>-PASS closed should be fulfilled after reader releases its lock (multiple stream locks)
</del><ins>+FAIL closed should be rejected after reader releases its lock (multiple stream locks) assert_equals: expected 2 but got 1
</ins><span class="cx"> PASS Multiple readers can access the stream in sequence
</span><span class="cx"> PASS Cannot use an already-released reader to unlock a stream again
</span><del>-PASS cancel() on a released reader is a no-op and does not pass through
</del><ins>+FAIL cancel() on a released reader is a no-op and does not pass through assert_unreached: cancel promise should not fulfill Reached unreachable code
</ins><span class="cx"> PASS Getting a second reader after erroring the stream should succeed
</span><span class="cx"> PASS Garbage-collecting a ReadableStreamReader should not unlock its stream
</span><span class="cx"> PASS ReadableStreamReader closed promise should be rejected with undefined if that is the error
</span></span></pre></div>
<a id="trunkLayoutTestsstreamsreferenceimplementationreadablestreamreaderhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/streams/reference-implementation/readable-stream-reader.html (191292 => 191293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/streams/reference-implementation/readable-stream-reader.html 2015-10-19 16:34:44 UTC (rev 191292)
+++ trunk/LayoutTests/streams/reference-implementation/readable-stream-reader.html 2015-10-19 16:36:44 UTC (rev 191293)
</span><span class="lines">@@ -4,6 +4,8 @@
</span><span class="cx"> <script src='resources/streams-utils.js'></script>
</span><span class="cx"> <script src='../../resources/gc.js'></script>
</span><span class="cx"> <script>
</span><ins>+// This is updated till https://github.com/whatwg/streams/commit/ec5ffa036308d9f6350d2946560d48cdbf090939
+
</ins><span class="cx"> var ReadableStreamReader;
</span><span class="cx">
</span><span class="cx"> test(function() {
</span><span class="lines">@@ -65,8 +67,8 @@
</span><span class="cx">
</span><span class="cx"> test(function() {
</span><span class="cx"> var rs = new ReadableStream();
</span><del>- new ReadableStreamReader(rs); // Constructing directly should be fine.
- assert_throws(new TypeError(), function() { new ReadableStreamReader(rs); }, 'constructing directly should fail');
</del><ins>+ new ReadableStreamReader(rs); // Constructing directly the first time should be fine.
+ assert_throws(new TypeError(), function() { new ReadableStreamReader(rs); }, 'constructing directly the second time should fail');
</ins><span class="cx"> }, 'Constructing a ReadableStreamReader directly should fail if the stream is already locked (via direct construction)');
</span><span class="cx">
</span><span class="cx"> test(function() {
</span><span class="lines">@@ -126,15 +128,16 @@
</span><span class="cx"> controller.enqueue('a');
</span><span class="cx"> });
</span><span class="cx">
</span><del>-var test2 = async_test('cancel() on a reader releases the reader before calling through');
</del><ins>+var test2 = async_test('cancel() on a reader does not release the reader');
</ins><span class="cx"> test2.step(function() {
</span><span class="cx"> var cancelCalled = false;
</span><span class="cx"> var passedReason = new Error('it wasn\'t the right time, sorry');
</span><span class="cx"> var rs = new ReadableStream({
</span><span class="cx"> cancel: function(reason) {
</span><ins>+ assert_true(rs.locked, 'the stream should still be locked');
+ assert_throws(new TypeError(), function() { rs.getReader(); }, 'should not be able to get another reader');
+ assert_equals(reason, passedReason, 'the cancellation reason is passed through to the underlying source');
</ins><span class="cx"> cancelCalled = true;
</span><del>- rs.getReader(); // Should be able to get another reader without error.
- assert_equals(reason, passedReason, 'the cancellation reason is passed through to the underlying source');
</del><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -144,7 +147,8 @@
</span><span class="cx"> assert_true(cancelCalled);
</span><span class="cx"> test2.done('reader.cancel() should fulfill');
</span><span class="cx"> }),
</span><del>- test2.step_func(function(e) { assert_unreached('reader.cancel() should not reject'); }));
</del><ins>+ test2.step_func(function(e) { assert_unreached('reader.cancel() should not reject'); })
+ );
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> var test3 = async_test('closed should be fulfilled after stream is closed (.closed access before acquiring)');
</span><span class="lines">@@ -164,10 +168,10 @@
</span><span class="cx"> controller.close();
</span><span class="cx"> });
</span><span class="cx">
</span><del>-var test4 = async_test('closed should be fulfilled after reader releases its lock (multiple stream locks)');
</del><ins>+var test4 = async_test('closed should be rejected after reader releases its lock (multiple stream locks)');
</ins><span class="cx"> test4.step(function() {
</span><ins>+ var promiseCalls = 0;
</ins><span class="cx"> var controller;
</span><del>- var reader1Closed = false;
</del><span class="cx"> var rs = new ReadableStream({
</span><span class="cx"> start: function(c) {
</span><span class="cx"> controller = c;
</span><span class="lines">@@ -181,12 +185,13 @@
</span><span class="cx"> var reader2 = rs.getReader();
</span><span class="cx"> controller.close();
</span><span class="cx">
</span><del>- reader1.closed.then(test4.step_func(function() {
- reader1Closed = true;
</del><ins>+ reader1.closed.catch(test4.step_func(function(e) {
+ assert_throws(new TypeError(), function() { throw e; }, 'reader1 closed should be rejected with a TypeError');
+ assert_equals(++promiseCalls, 1);
</ins><span class="cx"> }));
</span><span class="cx">
</span><span class="cx"> reader2.closed.then(test4.step_func(function() {
</span><del>- assert_true(reader1Closed);
</del><ins>+ assert_equals(++promiseCalls, 2);
</ins><span class="cx"> test4.done('reader2 closed should be fulfilled');
</span><span class="cx"> }));
</span><span class="cx"> });
</span><span class="lines">@@ -240,7 +245,7 @@
</span><span class="cx">
</span><span class="cx"> var test7 = async_test('cancel() on a released reader is a no-op and does not pass through');
</span><span class="cx"> test7.step(function() {
</span><del>- var cancelled = false;
</del><ins>+ var promiseCalls = 0;
</ins><span class="cx"> var rs = new ReadableStream({
</span><span class="cx"> start: function(c) {
</span><span class="cx"> c.enqueue('a');
</span><span class="lines">@@ -253,15 +258,16 @@
</span><span class="cx"> var reader = rs.getReader();
</span><span class="cx"> reader.releaseLock();
</span><span class="cx"> reader.cancel().then(test7.step_func(function(v) {
</span><del>- assert_equals(v, undefined, 'cancel() on the reader should fulfill with undefined')
- cancelled = true;
</del><ins>+ assert_unreached('cancel promise should not fulfill');
+ })).catch(test7.step_func(function(e) {
+ assert_equals(++promiseCalls, 2);
+ test7.done();
</ins><span class="cx"> }));
</span><span class="cx">
</span><span class="cx"> var reader2 = rs.getReader();
</span><span class="cx"> reader2.read().then(test7.step_func(function(r) {
</span><span class="cx"> assert_object_equals(r, { value: 'a', done: false }, 'a new reader should be able to read a chunk');
</span><del>- assert_true(cancelled);
- test7.done();
</del><ins>+ assert_equals(++promiseCalls, 1);
</ins><span class="cx"> }));
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -292,12 +298,16 @@
</span><span class="cx">
</span><span class="cx"> controller.error(theError);
</span><span class="cx">
</span><del>- rs.getReader().closed.catch(test8.step_func(function(e) {
</del><ins>+ reader1.releaseLock();
+
+ var reader2 = rs.getReader();
+
+ reader2.closed.catch(test8.step_func(function(e) {
</ins><span class="cx"> assert_equals(e, theError, 'the second reader closed getter should be rejected with the error');
</span><span class="cx"> ++receivedErrors;
</span><span class="cx"> }));
</span><span class="cx">
</span><del>- rs.getReader().read().catch(test8.step_func(function(e) {
</del><ins>+ reader2.read().catch(test8.step_func(function(e) {
</ins><span class="cx"> assert_equals(e, theError, 'the third reader read() should be rejected with the error');
</span><span class="cx"> assert_equals(++receivedErrors, 4);
</span><span class="cx"> test8.done();
</span></span></pre>
</div>
</div>
</body>
</html>