Skip to content

Commit 01fedc4

Browse files
panvapanva
committed
test: update WPT fixtures resources, common, streams, FileAPI
1 parent 53116b3 commit 01fedc4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+2026
-322
lines changed

‎test/common/wpt.js‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -453,12 +453,19 @@ class WPTRunner {
453453
this.scriptsModifier = modifier;
454454
}
455455

456-
fullInitScript(hasSubsetScript, locationSearchString) {
456+
fullInitScript(hasSubsetScript, locationSearchString, metaTitle, relativePath) {
457457
let { initScript } = this;
458-
if (hasSubsetScript || locationSearchString) {
458+
459+
if (hasSubsetScript || locationSearchString || !metaTitle) {
459460
initScript = `${initScript}\n\n//===\nglobalThis.location ||= {};`;
460461
}
461462

463+
if (metaTitle) {
464+
initScript = `${initScript}\n\n//===\nglobalThis.META_TITLE = "${metaTitle}";`;
465+
} else {
466+
initScript = `${initScript}\n\n//===\nglobalThis.location.pathname = "/${relativePath}";`;
467+
}
468+
462469
if (locationSearchString) {
463470
initScript = `${initScript}\n\n//===\nglobalThis.location.search = "${locationSearchString}";`;
464471
}
@@ -554,13 +561,17 @@ class WPTRunner {
554561
const harnessPath = fixtures.path('wpt', 'resources', 'testharness.js');
555562
const scriptsToRun = [];
556563
let hasSubsetScript = false;
564+
let needsGc = false;
557565

558566
// Scripts specified with the `// META: script=` header
559567
if (meta.script) {
560568
for (const script of meta.script) {
561569
if (script === '/common/subset-tests.js' || script === '/common/subset-tests-by-key.js') {
562570
hasSubsetScript = true;
563571
}
572+
if (script === '/common/gc.js') {
573+
needsGc = true;
574+
}
564575
const obj = {
565576
filename: this.resource.toRealFilePath(relativePath, script),
566577
code: this.resource.read(relativePath, script, false),
@@ -592,12 +603,13 @@ class WPTRunner {
592603
testRelativePath: relativePath,
593604
wptRunner: __filename,
594605
wptPath: this.path,
595-
initScript: this.fullInitScript(hasSubsetScript, variant),
606+
initScript: this.fullInitScript(hasSubsetScript, variant, meta.title, relativePath),
596607
harness: {
597608
code: fs.readFileSync(harnessPath, 'utf8'),
598609
filename: harnessPath,
599610
},
600611
scriptsToRun,
612+
needsGc,
601613
},
602614
});
603615
this.workers.set(testFileName, worker);
@@ -749,11 +761,7 @@ class WPTRunner {
749761
*/
750762
resultCallback(filename, test, reportResult) {
751763
const status = this.getTestStatus(test.status);
752-
const title = this.getTestTitle(filename);
753-
if (/^Untitled( \d+)?$/.test(test.name)) {
754-
test.name = `${title}${test.name.slice(8)}`;
755-
}
756-
console.log(`---- ${title} ----`);
764+
console.log(`---- ${test.name} ----`);
757765
if (status !== kPass) {
758766
this.fail(filename, test, status, reportResult);
759767
} else {

‎test/common/wpt/worker.js‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,29 @@
11
'use strict';
22

3-
const { runInThisContext } = require('vm');
3+
const { runInNewContext, runInThisContext } = require('vm');
4+
const { setFlagsFromString } = require('v8');
45
const { parentPort, workerData } = require('worker_threads');
56

67
const { ResourceLoader } = require(workerData.wptRunner);
78
const resource = new ResourceLoader(workerData.wptPath);
89

9-
global.self = global;
10-
global.GLOBAL = {
10+
if (workerData.needsGc) {
11+
// see https://github.com/nodejs/node/issues/16595#issuecomment-340288680
12+
setFlagsFromString('--expose-gc')
13+
globalThis.gc = runInNewContext('gc')
14+
}
15+
16+
globalThis.self = global;
17+
globalThis.GLOBAL = {
1118
isWindow() { return false; },
1219
isShadowRealm() { return false; },
1320
};
14-
global.require = require;
21+
globalThis.require = require;
1522

1623
// This is a mock, because at the moment fetch is not implemented
1724
// in Node.js, but some tests and harness depend on this to pull
1825
// resources.
19-
global.fetch = function fetch(file) {
26+
globalThis.fetch = function fetch(file) {
2027
return resource.read(workerData.testRelativePath, file, true);
2128
};
2229

‎test/fixtures/wpt/FileAPI/Blob-methods-from-detached-frame.html‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
<!DOCTYPE html>
2+
<meta charset="utf-8">
3+
<title>Blob methods from detached frame work as expected</title>
4+
<script src="/resources/testharness.js"></script>
5+
<script src="/resources/testharnessreport.js"></script>
6+
7+
<iframe id="emptyDocumentIframe" src="../support/empty-document.html"></iframe>
8+
9+
<script>
10+
const BlobPrototypeFromDetachedFramePromise = new Promise(resolve => {
11+
emptyDocumentIframe.onload = () => {
12+
const BlobPrototype = emptyDocumentIframe.contentWindow.Blob.prototype;
13+
emptyDocumentIframe.remove();
14+
resolve(BlobPrototype);
15+
};
16+
});
17+
18+
const charCodeArrayToString = charCodeArray => Array.from(charCodeArray, c => String.fromCharCode(c)).join("");
19+
const charCodeBufferToString = charCodeBuffer => charCodeArrayToString(new Uint8Array(charCodeBuffer));
20+
21+
promise_test(async () => {
22+
const { slice } = await BlobPrototypeFromDetachedFramePromise;
23+
const blob = new Blob(["foobar"]);
24+
25+
const slicedBlob = slice.call(blob, 1, 3);
26+
assert_true(slicedBlob instanceof Blob);
27+
28+
assert_equals(await slicedBlob.text(), "oo");
29+
assert_equals(charCodeBufferToString(await slicedBlob.arrayBuffer()), "oo");
30+
31+
const reader = slicedBlob.stream().getReader();
32+
const { value } = await reader.read();
33+
assert_equals(charCodeArrayToString(value), "oo");
34+
}, "slice()");
35+
36+
promise_test(async () => {
37+
const { text } = await BlobPrototypeFromDetachedFramePromise;
38+
const blob = new Blob(["foo"]);
39+
40+
assert_equals(await text.call(blob), "foo");
41+
}, "text()");
42+
43+
promise_test(async () => {
44+
const { arrayBuffer } = await BlobPrototypeFromDetachedFramePromise;
45+
const blob = new Blob(["bar"]);
46+
47+
const charCodeBuffer = await arrayBuffer.call(blob);
48+
assert_equals(charCodeBufferToString(charCodeBuffer), "bar");
49+
}, "arrayBuffer()");
50+
51+
promise_test(async () => {
52+
const { stream } = await BlobPrototypeFromDetachedFramePromise;
53+
const blob = new Blob(["baz"]);
54+
55+
const reader = stream.call(blob).getReader();
56+
const { value } = await reader.read();
57+
assert_equals(charCodeArrayToString(value), "baz");
58+
}, "stream()");
59+
</script>

0 commit comments

Comments
 (0)