[Fetch API] Reflect spec changes of bodyUsed property

third_party/WebKit/LayoutTests/http/tests/fetch/script-tests/response.js

 if (self.importScripts) {
   importScripts('../resources/fetch-test-helpers.js');
 }
 
 function consume(reader) {
   var chunks = [];
   function rec(reader) {
     return reader.read().then(function(r) {
         if (r.done) {
           return chunks;
@@ skipping 216 matching lines @@
           function() {
             new Response(new Blob(), {statusText: text});
           },
           'new Response with invalid statusText (' + text +
           ') must throw');
       });
   }, 'Response throw error test');
 
 promise_test(function(t) {
     var res = new Response('hello');
-    return consume(res.body.getReader()).then(function(chunks) {
-        return decode(chunks);
-      }).then(function(text) {
-        assert_equals(text, 'hello');

[tyoshino (SeeGerritForStatus), 2015/11/18 09:55:36]

shouldn't test above here kept? already covered somewhere else?

[yhirano, 2015/11/19 08:41:29]

Technically yes, in stream-reader.js.

-        return res.body.getReader().read();
-      }).then(function(r) {
-        assert_true(r.done);
-        return res.text();
-      }).then(function(r) {
-        assert_equals(r, '');
-      });
-  }, 'Read Response body via stream');
-
-promise_test(function(t) {
-    var res = new Response('hello');
     res.body.cancel();
     return res.body.getReader().read().then(function(r) {
         assert_true(r.done);
-        return res.text();
-      }).then(function(r) {
-        assert_equals(r, '');
       });
   }, 'Cancel body stream on Response');
 
 promise_test(function(t) {
     return new Response().text().then(text => {
         assert_equals(text.constructor, String);
         assert_equals(text, '');
       });
   }, 'call text() on null body response');
 
@@ skipping 12 matching lines @@
       });
   }, 'call blob() on null body response');
 
 promise_test(function(t) {
     return new Response().json().then(unreached_rejection(t), e => {
         assert_equals(e.constructor, SyntaxError);
       });
   }, 'call json() on null body response');
 
 promise_test(function(t) {
-    // TODO(yhirano): In the current implementation, The body stream always
-    // consists of one chunk and hence, we cannot create a meaning test case
-    // here. Fix this test case when reading into a size-specified buffer gets
-    // possible.
-    var size = 8 * 1024 * 1024;
-    var buffer = new ArrayBuffer(size);
-    var blob = new Blob([buffer]);
-
-    var res = new Response(blob);
-    var reader = res.body.getReader();
-    var head;
-    return reader.read().then(function(r) {
-        assert_false(r.done);
-        head = r.value;
-        assert_not_equals(head.byteLength, 0);
-        // TODO(yhirano): See above.
-        // assert_not_equals(head.byteLength, size);
-        reader.releaseLock();
-        return res.arrayBuffer();
-      }).then(function(buffer) {
-        assert_equals(buffer.byteLength + head.byteLength, size);
-        return res.body.getReader().read();
-      }).then(function(r) {
-        assert_true(r.done);
-      });
-  }, 'Partial read on Response');
-
-promise_test(function(t) {
     var res = new Response('hello');
     var body = res.body;
     var clone = res.clone();
+    assert_false(res.bodyUsed);
+    assert_false(clone.bodyUsed);
     assert_not_equals(res.body, body);
     assert_not_equals(res.body, clone.body);
     assert_not_equals(body, clone.body);
     assert_throws({name: 'TypeError'}, function() { body.getReader(); });
     return Promise.all([res.text(), clone.text()]).then(function(r) {
         assert_equals(r[0], 'hello');
         assert_equals(r[1], 'hello');
-        return Promise.all([res.text(), clone.text(), res.clone().text()]);
-      }).then(function(r) {
-        assert_equals(r[0], '');
-        assert_equals(r[1], '');
-        assert_equals(r[2], '');
       });
   }, 'Clone on Response (text)');
 
 promise_test(function(t) {
     var res = new Response('hello');
     var body = res.body;
     var clone = res.clone();
+    assert_false(res.bodyUsed);
+    assert_false(clone.bodyUsed);
     assert_not_equals(res.body, body);
     assert_not_equals(res.body, clone.body);
     assert_not_equals(body, clone.body);
     assert_throws({name: 'TypeError'}, function() { body.getReader(); });
     var reader1 = res.body.getReader();
     var reader2 = clone.body.getReader();
     return Promise.all([consume(reader1), consume(reader2)]).then(function(r) {
         assert_equals(decode(r[0]), 'hello');
         assert_equals(decode(r[1]), 'hello');
-        return Promise.all([res.text(), clone.text(), res.clone().text()]);
-      }).then(function(r) {
-        assert_equals(r[0], '');
-        assert_equals(r[1], '');
-        assert_equals(r[2], '');
       });
   }, 'Clone on Response (manual read)');
 
-promise_test(function(t) {
-    var res = new Response('hello');
-    var clone = res.clone();
-    res.body.cancel();
-    return Promise.all([res.text(), clone.text()]).then(function(r) {

[tyoshino (SeeGerritForStatus), 2015/11/18 09:55:36]

keep check on clone.text()?

[yhirano, 2015/11/19 08:41:29]

Tested at 'Cancelling stream should not affect cloned one.' in stream-reader.js

-        assert_equals(r[0], '');
-        assert_equals(r[1], 'hello');
-      });
-  }, 'Clone and Cancel on Response');
-
-promise_test(function(t) {
-    var res = new Response('hello');
-    res.body.cancel();
-    var clone = res.clone();
-    return Promise.all([res.blob(), clone.blob()]).then(function(r) {
-        assert_equals(r[0].type, 'text/plain;charset=utf-8', 'cloned type');
-        assert_equals(r[1].type, 'text/plain;charset=utf-8', 'original type');
-        assert_equals(r[0].size, 0, 'original size');
-        assert_equals(r[1].size, 0, 'cloned size');
-      });
-  }, 'Cancel and Clone on Response');

[tyoshino (SeeGerritForStatus), 2015/11/18 09:55:36]

ditto

[yhirano, 2015/11/19 08:41:29]

Added 'Used => clone' and 'Locked => clone'. Found a bug and fixed. Thanks!

-
 // Tests for MIME types.
 promise_test(function(t) {
     var res = new Response(new Blob(['']));
     return res.blob()
       .then(function(blob) {
           assert_equals(blob.type, '');
           assert_equals(res.headers.get('Content-Type'), null);
         });
   }, 'MIME type for Blob');
 
 promise_test(function(t) {
     var res = new Response(new Blob(['hello'], {type: 'Text/Plain'}));
     return res.blob()
       .then(function(blob) {
           assert_equals(blob.type, 'text/plain');
           assert_equals(blob.size, 5);
           assert_equals(res.headers.get('Content-Type'), 'text/plain');
-          return res.blob();
-        }).then(function(blob) {
-          // When we read from a response twice, it returns an empty contents.
-          // But the type should remain.
-          assert_equals(blob.type, 'text/plain');
-          assert_equals(blob.size, 0);
-          assert_equals(res.headers.get('Content-Type'), 'text/plain');
         });
   }, 'MIME type for Blob with non-empty type');
 
 promise_test(function(t) {
     var res = new Response(new FormData());
     return res.blob()
       .then(function(blob) {
           assert_equals(blob.type.indexOf('multipart/form-data; boundary='),
                         0);
           assert_equals(res.headers.get('Content-Type')
@@ skipping 38 matching lines @@
 promise_test(function(t) {
     var res = new Response(new Blob([''], {type: 'Text/Plain'}),
                            {headers: [['Content-Type', 'Text/Html']]});
     return res.blob()
       .then(function(blob) {
           assert_equals(blob.type, 'text/html');
           assert_equals(res.headers.get('Content-Type'), 'Text/Html');
         });
   }, 'Extract a MIME type (1)');
 
-promise_test(function(t) {
-    var res = new Response(new Blob([''], {type: 'Text/Plain'}),
-                           {headers: [['Content-Type', 'Text/Html']]});
-    res.body.cancel();
-    return res.blob()
-      .then(function(blob) {
-          assert_equals(blob.type, 'text/html');
-          assert_equals(res.headers.get('Content-Type'), 'Text/Html');
-        });
-  }, 'Extract a MIME type (2)');
-
-promise_test(function(t) {
-    var res = new Response(new Blob([''], {type: 'Text/Plain'}),
-                           {headers: [['Content-Type', 'Text/Html']]});
-    res.body.cancel();
-    res = res.clone();
-    return res.blob()
-      .then(function(blob) {
-          assert_equals(blob.type, 'text/html');
-          assert_equals(res.headers.get('Content-Type'), 'Text/Html');
-        });
-  }, 'Extract a MIME type (3)');
-
 promise_test(function() {
     var response = Response.error();
     return response.text().then(function(text) {
         assert_equals(response.type, 'error');
         assert_equals(response.url, '', 'url must be the empty string');
         assert_equals(response.status, 0, 'status is always 0');
         assert_false(response.ok);
         assert_equals(response.statusText, '',
                       'status message is always the empty byte sequence');
         assert_equals(size(response.headers), 0,
                       'header list is always empty.');
         assert_equals(text, '',
                       'body is always null');
       });
   }, 'Response.error()');
 
-promise_test(function(t) {
-    var res = new Response('hello');
-    return res.text().then(function(text) {
-        assert_equals(text, 'hello');
-        return Promise.all([res.text(), res.text()]);
-      }).then(function(texts) {
-        assert_equals(texts[0], '');
-        assert_equals(texts[1], '');
-        return res.body.getReader().read();
-      }).then(function(r) {
-        assert_true(r.done);
-        assert_equals(r.value, undefined);
-      });
-  }, 'Read after text()');
-
 promise_test(function() {
     var response = Response.redirect('https://www.example.com/test.html');
     return response.text().then(function(text) {
         assert_equals(response.status, 302,
                       'default value of status is always 302');
         assert_equals(response.headers.get('location'),
                       'https://www.example.com/test.html',
                       'Location header should be correct absoulte URL');
         assert_throws({name: 'TypeError'},
                       function() {
@@ skipping 21 matching lines @@
 test(function() {
     ['http://ex\x0aample.com',
      'http://ex\x0dample.com'].forEach(function(url) {
         assert_equals(Response.redirect(url).headers.get('Location'),
                       'http://example.com/',
                       'Location header value must not contain CR or LF');
       });
   }, 'Response.redirect() with URLs with CR or LF');
 
 done();