Diff
Modified: trunk/LayoutTests/imported/w3c/ChangeLog (237645 => 237646)
--- trunk/LayoutTests/imported/w3c/ChangeLog 2018-10-31 18:44:11 UTC (rev 237645)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2018-10-31 20:05:46 UTC (rev 237646)
@@ -1,3 +1,27 @@
+2018-10-31 Chris Dumez <cdu...@apple.com>
+
+ Resync XHR Web Platform Tests from upstream 44dd29fb0d
+ https://bugs.webkit.org/show_bug.cgi?id=191116
+
+ Reviewed by Youenn Fablet.
+
+ * web-platform-tests/xhr/getallresponseheaders-expected.txt:
+ * web-platform-tests/xhr/getallresponseheaders.htm:
+ * web-platform-tests/xhr/getresponseheader.any-expected.txt:
+ * web-platform-tests/xhr/getresponseheader.any.js:
+ (forEach.testValues.async_test.t.client.onload.t.step_func_done):
+ (async_test.t.client.onload.t.step_func_done): Deleted.
+ * web-platform-tests/xhr/getresponseheader.any.worker-expected.txt:
+ * web-platform-tests/xhr/resources/header-content-length-twice.asis: Added.
+ * web-platform-tests/xhr/resources/headers-double-empty.asis: Added.
+ * web-platform-tests/xhr/resources/headers-some-are-empty.asis: Added.
+ * web-platform-tests/xhr/resources/w3c-import.log:
+ * web-platform-tests/xhr/setrequestheader-combining.window-expected.txt: Added.
+ * web-platform-tests/xhr/setrequestheader-combining.window.html: Added.
+ * web-platform-tests/xhr/setrequestheader-combining.window.js: Added.
+ (test):
+ * web-platform-tests/xhr/w3c-import.log:
+
2018-10-31 YUHAN WU <yuhan...@apple.com>
MediaRecorder should fire dataavailable event when all tracks are ended and stop() is called
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/getallresponseheaders-expected.txt (237645 => 237646)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/getallresponseheaders-expected.txt 2018-10-31 18:44:11 UTC (rev 237645)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/getallresponseheaders-expected.txt 2018-10-31 20:05:46 UTC (rev 237646)
@@ -3,4 +3,7 @@
PASS XMLHttpRequest: getAllResponseHeaders() 1
PASS XMLHttpRequest: getAllResponseHeaders() 2
PASS XMLHttpRequest: getAllResponseHeaders() 3
+PASS XMLHttpRequest: getAllResponseHeaders() 4
+FAIL XMLHttpRequest: getAllResponseHeaders() 5 assert_equals: expected "heya: , \v\f, 1, , , 2\r\n" but got "heya: , , 1, , , 2\r\n"
+PASS XMLHttpRequest: getAllResponseHeaders() 6
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/getallresponseheaders.htm (237645 => 237646)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/getallresponseheaders.htm 2018-10-31 18:44:11 UTC (rev 237645)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/getallresponseheaders.htm 2018-10-31 20:05:46 UTC (rev 237646)
@@ -7,37 +7,29 @@
async_test((t) => {
const client = new XMLHttpRequest()
client._onload_ = t.step_func_done(() => {
- assert_equals(client.getAllResponseHeaders(), "foo-test: 1, 2, 3\r\n")
- })
- client._onerror_ = t.unreached_func("unexpected error")
- client.open("GET", "resources/headers-basic.asis")
- client.send(null)
-})
-
-async_test((t) => {
- const client = new XMLHttpRequest()
- client._onload_ = t.step_func_done(() => {
assert_equals(client.getAllResponseHeaders(), "also-here: Mr. PB\r\newok: lego\r\nfoo-test: 1, 2\r\n")
})
client._onerror_ = t.unreached_func("unexpected error")
client.open("GET", "resources/headers.asis")
client.send(null)
-})
+});
-test(() => {
- const client = new XMLHttpRequest
- client.open("GET", "resources/header-content-length.asis", false)
- client.send()
- assert_equals(client.getAllResponseHeaders(), "content-length: 0\r\n")
-})
-
-async_test(t => {
- const client = new XMLHttpRequest();
- client._onload_ = t.step_func_done(() => {
- assert_equals(client.getAllResponseHeaders(), "www-authenticate: 1, 2, 3, 4\r\n");
+[
+ ["content-length", "0", "header-content-length"],
+ ["content-length", "0, 0", "header-content-length-twice"],
+ ["double-trouble", ", ", "headers-double-empty"],
+ ["foo-test", "1, 2, 3", "headers-basic"],
+ ["heya", ", \u000B\u000C, 1, , , 2", "headers-some-are-empty"],
+ ["www-authenticate", "1, 2, 3, 4", "headers-www-authenticate"],
+].forEach(testValues => {
+ async_test(t => {
+ const client = new XMLHttpRequest();
+ client._onload_ = t.step_func_done(() => {
+ assert_equals(client.getAllResponseHeaders(), testValues[0] + ": " + testValues[1] + "\r\n");
+ });
+ client._onerror_ = t.unreached_func("unexpected error");
+ client.open("GET", "resources/" + testValues[2] + ".asis");
+ client.send();
});
- client._onerror_ = t.unreached_func("unexpected error");
- client.open("GET", "resources/headers-www-authenticate.asis");
- client.send();
});
</script>
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/getresponseheader.any-expected.txt (237645 => 237646)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/getresponseheader.any-expected.txt 2018-10-31 18:44:11 UTC (rev 237645)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/getresponseheader.any-expected.txt 2018-10-31 20:05:46 UTC (rev 237646)
@@ -1,4 +1,8 @@
-PASS getResponseHeader('foo-test')
-PASS getResponseHeader('www-authenticate')
+PASS getResponseHeader('content-length') expects 0
+PASS getResponseHeader('content-length') expects 0, 0
+PASS getResponseHeader('double-trouble') expects ,
+PASS getResponseHeader('foo-test') expects 1, 2, 3
+FAIL getResponseHeader('heya') expects , , 1, , , 2 assert_equals: expected ", \v\f, 1, , , 2" but got ", , 1, , , 2"
+PASS getResponseHeader('www-authenticate') expects 1, 2, 3, 4
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/getresponseheader.any.js (237645 => 237646)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/getresponseheader.any.js 2018-10-31 18:44:11 UTC (rev 237645)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/getresponseheader.any.js 2018-10-31 20:05:46 UTC (rev 237646)
@@ -1,19 +1,18 @@
-async_test(t => {
- const client = new XMLHttpRequest();
- client._onload_ = t.step_func_done(() => {
- assert_equals(client.getResponseHeader("foo-test"), "1, 2, 3");
- });
- client._onerror_ = t.unreached_func("unexpected error");
- client.open("GET", "resources/headers-basic.asis");
- client.send();
-}, "getResponseHeader('foo-test')");
-
-async_test(t => {
- const client = new XMLHttpRequest();
- client._onload_ = t.step_func_done(() => {
- assert_equals(client.getResponseHeader("www-authenticate"), "1, 2, 3, 4");
- });
- client._onerror_ = t.unreached_func("unexpected error");
- client.open("GET", "resources/headers-www-authenticate.asis");
- client.send();
-}, "getResponseHeader('www-authenticate')");
+[
+ ["content-length", "0", "header-content-length"],
+ ["content-length", "0, 0", "header-content-length-twice"],
+ ["double-trouble", ", ", "headers-double-empty"],
+ ["foo-test", "1, 2, 3", "headers-basic"],
+ ["heya", ", \u000B\u000C, 1, , , 2", "headers-some-are-empty"],
+ ["www-authenticate", "1, 2, 3, 4", "headers-www-authenticate"],
+].forEach(testValues => {
+ async_test(t => {
+ const client = new XMLHttpRequest();
+ client._onload_ = t.step_func_done(() => {
+ assert_equals(client.getResponseHeader(testValues[0]), testValues[1]);
+ });
+ client._onerror_ = t.unreached_func("unexpected error");
+ client.open("GET", "resources/" + testValues[2] + ".asis");
+ client.send();
+ }, "getResponseHeader('" + testValues[0] + "') expects " + testValues[1]);
+});
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/getresponseheader.any.worker-expected.txt (237645 => 237646)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/getresponseheader.any.worker-expected.txt 2018-10-31 18:44:11 UTC (rev 237645)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/getresponseheader.any.worker-expected.txt 2018-10-31 20:05:46 UTC (rev 237646)
@@ -1,4 +1,8 @@
-PASS getResponseHeader('foo-test')
-PASS getResponseHeader('www-authenticate')
+PASS getResponseHeader('content-length') expects 0
+PASS getResponseHeader('content-length') expects 0, 0
+PASS getResponseHeader('double-trouble') expects ,
+PASS getResponseHeader('foo-test') expects 1, 2, 3
+FAIL getResponseHeader('heya') expects , , 1, , , 2 assert_equals: expected ", \v\f, 1, , , 2" but got ", , 1, , , 2"
+PASS getResponseHeader('www-authenticate') expects 1, 2, 3, 4
Added: trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/header-content-length-twice.asis (0 => 237646)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/header-content-length-twice.asis (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/header-content-length-twice.asis 2018-10-31 20:05:46 UTC (rev 237646)
@@ -0,0 +1,3 @@
+HTTP/1.0 200 NANANA
+CONTENT-LENGTH: 0
+content-length: 0
Added: trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/headers-double-empty.asis (0 => 237646)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/headers-double-empty.asis (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/headers-double-empty.asis 2018-10-31 20:05:46 UTC (rev 237646)
@@ -0,0 +1,3 @@
+HTTP/1.1 444 HI
+double-trouble:
+double-trouble:
Added: trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/headers-some-are-empty.asis (0 => 237646)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/headers-some-are-empty.asis (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/headers-some-are-empty.asis 2018-10-31 20:05:46 UTC (rev 237646)
@@ -0,0 +1,7 @@
+HTTP/1.0 200 MEH
+HEYA:
+HEYA:
+HEYA: 1
+HEYA:
+HEYA:
+HEYA: 2
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/w3c-import.log (237645 => 237646)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/w3c-import.log 2018-10-31 18:44:11 UTC (rev 237645)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/w3c-import.log 2018-10-31 20:05:46 UTC (rev 237646)
@@ -52,9 +52,12 @@
/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/folder.txt
/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/form.py
/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/gzip.py
+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/header-content-length-twice.asis
/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/header-content-length.asis
/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/header-user-agent.py
/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/headers-basic.asis
+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/headers-double-empty.asis
+/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/headers-some-are-empty.asis
/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/headers-www-authenticate.asis
/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/headers.asis
/LayoutTests/imported/w3c/web-platform-tests/xhr/resources/headers.py
Added: trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-combining.window-expected.txt (0 => 237646)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-combining.window-expected.txt (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-combining.window-expected.txt 2018-10-31 20:05:46 UTC (rev 237646)
@@ -0,0 +1,3 @@
+
+PASS setRequestHeader() combining header values
+
Added: trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-combining.window.html (0 => 237646)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-combining.window.html (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-combining.window.html 2018-10-31 20:05:46 UTC (rev 237646)
@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
\ No newline at end of file
Added: trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-combining.window.js (0 => 237646)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-combining.window.js (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-combining.window.js 2018-10-31 20:05:46 UTC (rev 237646)
@@ -0,0 +1,12 @@
+test(() => {
+ const client = new XMLHttpRequest();
+ client.open("POST", "resources/inspect-headers.py?filter_name=test-me", false);
+ client.setRequestHeader("test-me", "");
+ client.setRequestHeader("test-me", "");
+ client.setRequestHeader("test-me", " ");
+ client.setRequestHeader("test-me", "\t");
+ client.setRequestHeader("test-me", "x\tx");
+ client.setRequestHeader("test-me", "");
+ client.send();
+ assert_equals(client.responseText, "test-me: , , , , x\tx, \n");
+}, "setRequestHeader() combining header values");
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/w3c-import.log (237645 => 237646)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/w3c-import.log 2018-10-31 18:44:11 UTC (rev 237645)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/w3c-import.log 2018-10-31 20:05:46 UTC (rev 237646)
@@ -267,6 +267,7 @@
/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-bogus-name.htm
/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-bogus-value.htm
/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-case-insensitive.htm
+/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-combining.window.js
/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-content-type.htm
/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-header-allowed.htm
/LayoutTests/imported/w3c/web-platform-tests/xhr/setrequestheader-header-forbidden.htm
