test,benchmark: use tmpdir.fileURL()

PR-URL: nodejs/node#49138 Refs: nodejs/node#49040 Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
sercher · Apr 25, 2024 · 1eea878 · 1eea878
1 parent 59cf0e0
commit 1eea878
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 16 deletions.
diff --git a/graal-nodejs/benchmark/esm/esm-loader-import.js b/graal-nodejs/benchmark/esm/esm-loader-import.js
@@ -2,13 +2,11 @@
 // general startup, does not test lazy operations
 'use strict';
 const fs = require('node:fs');
-const path = require('node:path');
 const common = require('../common.js');
 
 const tmpdir = require('../../test/common/tmpdir.js');
-const { pathToFileURL } = require('node:url');
 
-const benchmarkDirectory = pathToFileURL(path.resolve(tmpdir.path, 'benchmark-import'));
+const benchmarkDirectory = tmpdir.fileURL('benchmark-import');
 
 const configs = {
   n: [1e3],

diff --git a/graal-nodejs/test/es-module/test-esm-dynamic-import-mutating-fs.js b/graal-nodejs/test/es-module/test-esm-dynamic-import-mutating-fs.js
@@ -4,12 +4,9 @@ const tmpdir = require('../common/tmpdir');
 
 const assert = require('node:assert');
 const fs = require('node:fs/promises');
-const { pathToFileURL } = require('node:url');
 
 tmpdir.refresh();
-const tmpDir = pathToFileURL(tmpdir.path);
-
-const target = new URL(`./${Math.random()}.mjs`, tmpDir);
+const target = tmpdir.fileURL(`${Math.random()}.mjs`);
 
 (async () => {
 

diff --git a/graal-nodejs/test/es-module/test-esm-dynamic-import-mutating-fs.mjs b/graal-nodejs/test/es-module/test-esm-dynamic-import-mutating-fs.mjs
@@ -4,12 +4,9 @@ import tmpdir from '../common/tmpdir.js';
 import assert from 'node:assert';
 import fs from 'node:fs/promises';
 import { execPath } from 'node:process';
-import { pathToFileURL } from 'node:url';
 
 tmpdir.refresh();
-const tmpDir = pathToFileURL(tmpdir.path);
-
-const target = new URL(`./${Math.random()}.mjs`, tmpDir);
+const target = tmpdir.fileURL(`${Math.random()}.mjs`);
 
 await assert.rejects(import(target), { code: 'ERR_MODULE_NOT_FOUND' });
 

diff --git a/graal-nodejs/test/node-api/test_policy/test_policy.js b/graal-nodejs/test/node-api/test_policy/test_policy.js
@@ -24,11 +24,6 @@ const policyFilepath = path.join(tmpdir.path, 'policy');
 const depFilepath = require.resolve(`./build/${common.buildType}/binding.node`);
 const depURL = pathToFileURL(depFilepath);
 
-const tmpdirURL = pathToFileURL(tmpdir.path);
-if (!tmpdirURL.pathname.endsWith('/')) {
-  tmpdirURL.pathname += '/';
-}
-
 const depBody = fs.readFileSync(depURL);
 function writePolicy(...resources) {
   const manifest = { resources: {} };