From 96785dc2c2e277d10da2fb3dabe22033ed768fd2 Mon Sep 17 00:00:00 2001
From: RedYetiDev <38299977+RedYetiDev@users.noreply.github.com>
Date: Mon, 30 Sep 2024 15:37:40 -0400
Subject: [PATCH 1/2] test: update `FileAPI` wpt
---
...-partition-navigation.tentative.https.html | 128 ++++++
...ition-worker-creation.tentative.https.html | 150 +++++++
.../cross-partition.tentative.https.html | 419 ++++++++++++++----
.../wpt/FileAPI/blob/Blob-constructor.any.js | 12 +-
.../filereader_readAsArrayBuffer.any.js | 1 +
test/fixtures/wpt/FileAPI/support/Blob.js | 34 +-
.../FileAPI/support/send-file-form-helper.js | 2 +-
.../support/send-file-formdata-helper.js | 2 +-
test/fixtures/wpt/README.md | 2 +-
test/fixtures/wpt/versions.json | 2 +-
test/wpt/status/FileAPI/blob.json | 35 +-
11 files changed, 636 insertions(+), 151 deletions(-)
create mode 100644 test/fixtures/wpt/FileAPI/BlobURL/cross-partition-navigation.tentative.https.html
create mode 100644 test/fixtures/wpt/FileAPI/BlobURL/cross-partition-worker-creation.tentative.https.html
diff --git a/test/fixtures/wpt/FileAPI/BlobURL/cross-partition-navigation.tentative.https.html b/test/fixtures/wpt/FileAPI/BlobURL/cross-partition-navigation.tentative.https.html
new file mode 100644
index 00000000000000..80d3f6818b4d82
--- /dev/null
+++ b/test/fixtures/wpt/FileAPI/BlobURL/cross-partition-navigation.tentative.https.html
@@ -0,0 +1,128 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/test/fixtures/wpt/FileAPI/BlobURL/cross-partition-worker-creation.tentative.https.html b/test/fixtures/wpt/FileAPI/BlobURL/cross-partition-worker-creation.tentative.https.html
new file mode 100644
index 00000000000000..c8234cfb769b05
--- /dev/null
+++ b/test/fixtures/wpt/FileAPI/BlobURL/cross-partition-worker-creation.tentative.https.html
@@ -0,0 +1,150 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/test/fixtures/wpt/FileAPI/BlobURL/cross-partition.tentative.https.html b/test/fixtures/wpt/FileAPI/BlobURL/cross-partition.tentative.https.html
index c75ce07d054eb7..5cdaad5f0af2d5 100644
--- a/test/fixtures/wpt/FileAPI/BlobURL/cross-partition.tentative.https.html
+++ b/test/fixtures/wpt/FileAPI/BlobURL/cross-partition.tentative.https.html
@@ -13,31 +13,54 @@
-
+
\ No newline at end of file
diff --git a/test/fixtures/wpt/FileAPI/blob/Blob-constructor.any.js b/test/fixtures/wpt/FileAPI/blob/Blob-constructor.any.js
index 6dc44e8e156cce..57a85624340e56 100644
--- a/test/fixtures/wpt/FileAPI/blob/Blob-constructor.any.js
+++ b/test/fixtures/wpt/FileAPI/blob/Blob-constructor.any.js
@@ -290,14 +290,22 @@ test_blob(function() {
new Int16Array([0x4150, 0x5353]),
new Uint32Array([0x53534150]),
new Int32Array([0x53534150]),
- new Float16Array([2.65625, 58.59375]),
new Float32Array([0xD341500000])
]);
}, {
- expected: "PASSPASSPASSPASSPASSPASSPASSPASS",
+ expected: "PASSPASSPASSPASSPASSPASSPASS",
type: "",
desc: "Passing typed arrays as elements of the blobParts array should work."
});
+test_blob(function() {
+ return new Blob([
+ new Float16Array([2.65625, 58.59375])
+ ]);
+}, {
+ expected: "PASS",
+ type: "",
+ desc: "Passing a Float16Array as element of the blobParts array should work."
+});
test_blob(function() {
return new Blob([
// 0x535 3415053534150
diff --git a/test/fixtures/wpt/FileAPI/reading-data-section/filereader_readAsArrayBuffer.any.js b/test/fixtures/wpt/FileAPI/reading-data-section/filereader_readAsArrayBuffer.any.js
index d06e3170782b7c..88c4f4d26cc0b2 100644
--- a/test/fixtures/wpt/FileAPI/reading-data-section/filereader_readAsArrayBuffer.any.js
+++ b/test/fixtures/wpt/FileAPI/reading-data-section/filereader_readAsArrayBuffer.any.js
@@ -7,6 +7,7 @@
reader.onload = this.step_func(function(evt) {
assert_equals(reader.result.byteLength, 4, "The byteLength is 4");
assert_true(reader.result instanceof ArrayBuffer, "The result is instanceof ArrayBuffer");
+ assert_array_equals(new Uint8Array(reader.result), [84, 69, 83, 84]);
assert_equals(reader.readyState, reader.DONE);
this.done();
});
diff --git a/test/fixtures/wpt/FileAPI/support/Blob.js b/test/fixtures/wpt/FileAPI/support/Blob.js
index 2c249746858918..e8a52425a17085 100644
--- a/test/fixtures/wpt/FileAPI/support/Blob.js
+++ b/test/fixtures/wpt/FileAPI/support/Blob.js
@@ -5,23 +5,16 @@ self.test_blob = (fn, expectations) => {
type = expectations.type,
desc = expectations.desc;
- var t = async_test(desc);
- t.step(function() {
+ promise_test(async (t) => {
var blob = fn();
assert_true(blob instanceof Blob);
assert_false(blob instanceof File);
assert_equals(blob.type, type);
assert_equals(blob.size, expected.length);
- var fr = new FileReader();
- fr.onload = t.step_func_done(function(event) {
- assert_equals(this.result, expected);
- }, fr);
- fr.onerror = t.step_func(function(e) {
- assert_unreached("got error event on FileReader");
- });
- fr.readAsText(blob, "UTF-8");
- });
+ const text = await blob.text();
+ assert_equals(text, expected);
+ }, desc);
}
self.test_blob_binary = (fn, expectations) => {
@@ -29,25 +22,18 @@ self.test_blob_binary = (fn, expectations) => {
type = expectations.type,
desc = expectations.desc;
- var t = async_test(desc);
- t.step(function() {
+ promise_test(async (t) => {
var blob = fn();
assert_true(blob instanceof Blob);
assert_false(blob instanceof File);
assert_equals(blob.type, type);
assert_equals(blob.size, expected.length);
- var fr = new FileReader();
- fr.onload = t.step_func_done(function(event) {
- assert_true(this.result instanceof ArrayBuffer,
- "Result should be an ArrayBuffer");
- assert_array_equals(new Uint8Array(this.result), expected);
- }, fr);
- fr.onerror = t.step_func(function(e) {
- assert_unreached("got error event on FileReader");
- });
- fr.readAsArrayBuffer(blob);
- });
+ const ab = await blob.arrayBuffer();
+ assert_true(ab instanceof ArrayBuffer,
+ "Result should be an ArrayBuffer");
+ assert_array_equals(new Uint8Array(ab), expected);
+ }, desc);
}
// Assert that two TypedArray objects have the same byte values
diff --git a/test/fixtures/wpt/FileAPI/support/send-file-form-helper.js b/test/fixtures/wpt/FileAPI/support/send-file-form-helper.js
index 39c73c41b42207..d6adf21ec33795 100644
--- a/test/fixtures/wpt/FileAPI/support/send-file-form-helper.js
+++ b/test/fixtures/wpt/FileAPI/support/send-file-form-helper.js
@@ -180,7 +180,7 @@ const formPostFileUploadTest = ({
// Used to verify that the browser agrees with the test about
// field value replacement and encoding independently of file system
- // idiosyncrasies.
+ // idiosyncracies.
form.append(Object.assign(document.createElement('input'), {
type: 'hidden',
name: 'filename',
diff --git a/test/fixtures/wpt/FileAPI/support/send-file-formdata-helper.js b/test/fixtures/wpt/FileAPI/support/send-file-formdata-helper.js
index dd62a0e98e92c8..53c8cca7e09b8e 100644
--- a/test/fixtures/wpt/FileAPI/support/send-file-formdata-helper.js
+++ b/test/fixtures/wpt/FileAPI/support/send-file-formdata-helper.js
@@ -34,7 +34,7 @@ const formDataPostFileUploadTest = ({
// Used to verify that the browser agrees with the test about
// field value replacement and encoding independently of file system
- // idiosyncrasies.
+ // idiosyncracies.
formData.append("filename", fileBaseName);
// Same, but with name and value reversed to ensure field names
diff --git a/test/fixtures/wpt/README.md b/test/fixtures/wpt/README.md
index 2c8a8b9b03afa9..ab9f1f225f3c88 100644
--- a/test/fixtures/wpt/README.md
+++ b/test/fixtures/wpt/README.md
@@ -17,7 +17,7 @@ Last update:
- dom/events: https://github.com/web-platform-tests/wpt/tree/0a811c5161/dom/events
- encoding: https://github.com/web-platform-tests/wpt/tree/1ac8deee08/encoding
- fetch/data-urls/resources: https://github.com/web-platform-tests/wpt/tree/7c79d998ff/fetch/data-urls/resources
-- FileAPI: https://github.com/web-platform-tests/wpt/tree/cceaf3628d/FileAPI
+- FileAPI: https://github.com/web-platform-tests/wpt/tree/8b5024d792/FileAPI
- hr-time: https://github.com/web-platform-tests/wpt/tree/34cafd797e/hr-time
- html/webappapis/atob: https://github.com/web-platform-tests/wpt/tree/f267e1dca6/html/webappapis/atob
- html/webappapis/microtask-queuing: https://github.com/web-platform-tests/wpt/tree/2c5c3c4c27/html/webappapis/microtask-queuing
diff --git a/test/fixtures/wpt/versions.json b/test/fixtures/wpt/versions.json
index a93ad1762feb80..54d484b3c3a752 100644
--- a/test/fixtures/wpt/versions.json
+++ b/test/fixtures/wpt/versions.json
@@ -28,7 +28,7 @@
"path": "fetch/data-urls/resources"
},
"FileAPI": {
- "commit": "cceaf3628da950621004d9b5d8c1d1f367073347",
+ "commit": "8b5024d792f2f15a230ed4716906cc302f967ae7",
"path": "FileAPI"
},
"hr-time": {
diff --git a/test/wpt/status/FileAPI/blob.json b/test/wpt/status/FileAPI/blob.json
index 8ea03bbc019992..d089acbed5108e 100644
--- a/test/wpt/status/FileAPI/blob.json
+++ b/test/wpt/status/FileAPI/blob.json
@@ -4,38 +4,13 @@
},
"Blob-constructor.any.js": {
"fail": {
- "note": "Depends on File API",
"expected": [
- "A plain object with @@iterator should be treated as a sequence for the blobParts argument.",
- "A plain object with @@iterator and a length property should be treated as a sequence for the blobParts argument.",
- "A String object should be treated as a sequence for the blobParts argument.",
- "A Uint8Array object should be treated as a sequence for the blobParts argument.",
"Getters and value conversions should happen in order until an exception is thrown.",
- "Changes to the blobParts array should be reflected in the returned Blob (pop).",
- "Changes to the blobParts array should be reflected in the returned Blob (unshift).",
- "ToString should be called on elements of the blobParts array.",
- "ArrayBuffer elements of the blobParts array should be supported.",
- "Passing typed arrays as elements of the blobParts array should work.",
- "Passing a Float64Array as element of the blobParts array should work.",
- "Passing BigInt typed arrays as elements of the blobParts array should work.",
- "Array with two blobs",
- "Array with two buffers",
- "Array with two bufferviews",
- "Array with mixed types",
"options properties should be accessed in lexicographic order.",
- "Arguments should be evaluated from left to right.",
- "Passing null (index 0) for options should use the defaults.",
- "Passing null (index 0) for options should use the defaults (with newlines).",
- "Passing undefined (index 1) for options should use the defaults.",
- "Passing undefined (index 1) for options should use the defaults (with newlines).",
- "Passing object \"[object Object]\" (index 2) for options should use the defaults.",
- "Passing object \"[object Object]\" (index 2) for options should use the defaults (with newlines).",
- "Passing object \"[object Object]\" (index 3) for options should use the defaults.",
- "Passing object \"[object Object]\" (index 3) for options should use the defaults (with newlines).",
- "Passing object \"/regex/\" (index 4) for options should use the defaults.",
- "Passing object \"/regex/\" (index 4) for options should use the defaults (with newlines).",
- "Passing function \"function() {}\" (index 5) for options should use the defaults.",
- "Passing function \"function() {}\" (index 5) for options should use the defaults (with newlines)."
+ "Arguments should be evaluated from left to right."
+ ],
+ "unexpected": [
+ "Passing a Float16Array as element of the blobParts array should work."
]
}
},
@@ -45,4 +20,4 @@
"Blob-slice.any.js": {
"skip": "Depends on File API"
}
-}
+}
\ No newline at end of file
From b1c015cc9b56f004362398567e708c7aecb65be4 Mon Sep 17 00:00:00 2001
From: RedYetiDev <38299977+RedYetiDev@users.noreply.github.com>
Date: Mon, 30 Sep 2024 15:39:32 -0400
Subject: [PATCH 2/2] fixup! test: update `FileAPI` wpt
---
test/wpt/status/FileAPI/blob.json | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/test/wpt/status/FileAPI/blob.json b/test/wpt/status/FileAPI/blob.json
index d089acbed5108e..06e5779683e341 100644
--- a/test/wpt/status/FileAPI/blob.json
+++ b/test/wpt/status/FileAPI/blob.json
@@ -7,9 +7,7 @@
"expected": [
"Getters and value conversions should happen in order until an exception is thrown.",
"options properties should be accessed in lexicographic order.",
- "Arguments should be evaluated from left to right."
- ],
- "unexpected": [
+ "Arguments should be evaluated from left to right.",
"Passing a Float16Array as element of the blobParts array should work."
]
}