From e91d14c57caa5e9f536bdffea2a10901696801a3 Mon Sep 17 00:00:00 2001 From: himself65 Date: Thu, 13 May 2021 21:56:50 +0800 Subject: [PATCH] test: simplify test-path-resolve.js MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR-URL: https://github.com/nodejs/node/pull/38671 Reviewed-By: Juan José Arboleda Reviewed-By: Rich Trott Reviewed-By: Colin Ihrig Reviewed-By: James M Snell --- test/parallel/test-path-resolve.js | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/test/parallel/test-path-resolve.js b/test/parallel/test-path-resolve.js index 77eafd543aac18..3fc9b2e3abd90a 100644 --- a/test/parallel/test-path-resolve.js +++ b/test/parallel/test-path-resolve.js @@ -46,10 +46,9 @@ const resolveTests = [ ], ], ]; -resolveTests.forEach((test) => { - const resolve = test[0]; - test[1].forEach((test) => { - const actual = resolve.apply(null, test[0]); +resolveTests.forEach(([resolve, tests]) => { + tests.forEach(([test, expected]) => { + const actual = resolve.apply(null, test); let actualAlt; const os = resolve === path.win32.resolve ? 'win32' : 'posix'; if (resolve === path.win32.resolve && !common.isWindows) @@ -57,15 +56,14 @@ resolveTests.forEach((test) => { else if (resolve !== path.win32.resolve && common.isWindows) actualAlt = actual.replace(slashRE, '\\'); - const expected = test[1]; const message = - `path.${os}.resolve(${test[0].map(JSON.stringify).join(',')})\n expect=${ + `path.${os}.resolve(${test.map(JSON.stringify).join(',')})\n expect=${ JSON.stringify(expected)}\n actual=${JSON.stringify(actual)}`; if (actual !== expected && actualAlt !== expected) - failures.push(`\n${message}`); + failures.push(message); }); }); -assert.strictEqual(failures.length, 0, failures.join('')); +assert.strictEqual(failures.length, 0, failures.join('\n')); if (common.isWindows) { // Test resolving the current Windows drive letter from a spawned process.