From 8653d9223e689693a792f4e8f1668dd950a95cfa Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Wed, 22 May 2024 08:08:59 +0300 Subject: [PATCH] test: replace `.substr` with `.slice` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `String.prototype.substr` is deprecated, and using it will raise an error when using ESLint 9+. Co-authored-by: =?UTF-8?q?Micha=C3=ABl=20Zasso?= PR-URL: https://github.com/nodejs/node/pull/53070 Reviewed-By: Michaël Zasso Reviewed-By: Trivikram Kamat Reviewed-By: Benjamin Gruenbaum Reviewed-By: Luigi Pinca Reviewed-By: Yagiz Nizipli Reviewed-By: Juan José Arboleda Reviewed-By: Moshe Atlow Reviewed-By: Tierney Cyren Reviewed-By: Tobias Nießen --- test/es-module/test-esm-exports.mjs | 2 +- test/es-module/test-esm-imports.mjs | 2 +- test/parallel/test-crypto-authenticated.js | 2 +- test/parallel/test-crypto-hmac.js | 4 ++-- test/parallel/test-crypto-randomuuid.js | 4 ++-- test/parallel/test-fs-realpath.js | 4 ++-- test/parallel/test-http-content-length.js | 2 +- test/parallel/test-http-upgrade-server.js | 6 +++--- test/parallel/test-path-dirname.js | 2 +- test/parallel/test-repl-tab-complete.js | 2 +- test/parallel/test-repl.js | 8 ++++---- test/parallel/test-webcrypto-digest.js | 2 +- test/parallel/test-zlib-truncated.js | 4 ++-- 13 files changed, 22 insertions(+), 22 deletions(-) diff --git a/test/es-module/test-esm-exports.mjs b/test/es-module/test-esm-exports.mjs index 01432d92227e10..490e91a78dd21f 100644 --- a/test/es-module/test-esm-exports.mjs +++ b/test/es-module/test-esm-exports.mjs @@ -231,7 +231,7 @@ const { requireFromInside, importFromInside } = fromInside; }); function assertStartsWith(actual, expected) { - const start = actual.toString().substr(0, expected.length); + const start = actual.toString().slice(0, expected.length); strictEqual(start, expected); } diff --git a/test/es-module/test-esm-imports.mjs b/test/es-module/test-esm-imports.mjs index 2720f47974128a..4b7e97eb8d2c5c 100644 --- a/test/es-module/test-esm-imports.mjs +++ b/test/es-module/test-esm-imports.mjs @@ -124,7 +124,7 @@ requireFixture('#cjs').then(mustCall((actual) => { })); function assertStartsWith(actual, expected) { - const start = actual.toString().substr(0, expected.length); + const start = actual.toString().slice(0, expected.length); strictEqual(start, expected); } diff --git a/test/parallel/test-crypto-authenticated.js b/test/parallel/test-crypto-authenticated.js index 6178445adbc634..59dd3b69c4bdf6 100644 --- a/test/parallel/test-crypto-authenticated.js +++ b/test/parallel/test-crypto-authenticated.js @@ -284,7 +284,7 @@ for (const test of TEST_CASES) { cipher.update('01234567', 'hex'); cipher.final(); const tag = cipher.getAuthTag(); - assert.strictEqual(tag.toString('hex'), fullTag.substr(0, 2 * e)); + assert.strictEqual(tag.toString('hex'), fullTag.slice(0, 2 * e)); } } diff --git a/test/parallel/test-crypto-hmac.js b/test/parallel/test-crypto-hmac.js index 0edea0dfb0fdcc..c909f8edc1b242 100644 --- a/test/parallel/test-crypto-hmac.js +++ b/test/parallel/test-crypto-hmac.js @@ -272,8 +272,8 @@ for (let i = 0, l = rfc4231.length; i < l; i++) { .update(rfc4231[i].data) .digest('hex'); if (rfc4231[i].truncate) { - actual = actual.substr(0, 32); // first 128 bits == 32 hex chars - strRes = strRes.substr(0, 32); + actual = actual.slice(0, 32); // first 128 bits == 32 hex chars + strRes = strRes.slice(0, 32); } const expected = rfc4231[i].hmac[hash]; assert.strictEqual( diff --git a/test/parallel/test-crypto-randomuuid.js b/test/parallel/test-crypto-randomuuid.js index 23e97fb8cf49a1..30ef6b23080f1f 100644 --- a/test/parallel/test-crypto-randomuuid.js +++ b/test/parallel/test-crypto-randomuuid.js @@ -34,11 +34,11 @@ for (let n = 0; n < 130; n++) { // Check that version 4 identifier was populated. assert.strictEqual( - Buffer.from(uuid.substr(14, 2), 'hex')[0] & 0x40, 0x40); + Buffer.from(uuid.slice(14, 16), 'hex')[0] & 0x40, 0x40); // Check that clock_seq_hi_and_reserved was populated with reserved bits. assert.strictEqual( - Buffer.from(uuid.substr(19, 2), 'hex')[0] & 0b1100_0000, 0b1000_0000); + Buffer.from(uuid.slice(19, 21), 'hex')[0] & 0b1100_0000, 0b1000_0000); } // Test non-buffered UUID's diff --git a/test/parallel/test-fs-realpath.js b/test/parallel/test-fs-realpath.js index 3e9f3512b802fc..d944195de3de0c 100644 --- a/test/parallel/test-fs-realpath.js +++ b/test/parallel/test-fs-realpath.js @@ -42,7 +42,7 @@ let root = '/'; let assertEqualPath = assert.strictEqual; if (common.isWindows) { // Something like "C:\\" - root = process.cwd().substr(0, 3); + root = process.cwd().slice(0, 3); assertEqualPath = function(path_left, path_right, message) { assert .strictEqual(path_left.toLowerCase(), path_right.toLowerCase(), message); @@ -367,7 +367,7 @@ function test_deep_symlink_mix(realpath, realpathSync, callback) { function test_non_symlinks(realpath, realpathSync, callback) { console.log('test_non_symlinks'); const entrydir = path.dirname(tmpAbsDir); - const entry = `${tmpAbsDir.substr(entrydir.length + 1)}/cycles/root.js`; + const entry = `${tmpAbsDir.slice(entrydir.length + 1)}/cycles/root.js`; const expected = `${tmpAbsDir}/cycles/root.js`; const origcwd = process.cwd(); process.chdir(entrydir); diff --git a/test/parallel/test-http-content-length.js b/test/parallel/test-http-content-length.js index eca32894f573a9..e5d04c34656376 100644 --- a/test/parallel/test-http-content-length.js +++ b/test/parallel/test-http-content-length.js @@ -26,7 +26,7 @@ const server = http.createServer(function(req, res) { res.removeHeader('Date'); res.setHeader('Keep-Alive', 'timeout=1'); - switch (req.url.substr(1)) { + switch (req.url.slice(1)) { case 'multiple-writes': delete req.headers.host; assert.deepStrictEqual(req.headers, expectedHeadersMultipleWrites); diff --git a/test/parallel/test-http-upgrade-server.js b/test/parallel/test-http-upgrade-server.js index b04d488b88a4ef..494f4a82197c08 100644 --- a/test/parallel/test-http-upgrade-server.js +++ b/test/parallel/test-http-upgrade-server.js @@ -100,7 +100,7 @@ function test_upgrade_with_listener() { assert.strictEqual(typeof data, 'string'); if (state === 1) { - assert.strictEqual(data.substr(0, 12), 'HTTP/1.1 101'); + assert.strictEqual(data.slice(0, 12), 'HTTP/1.1 101'); assert.strictEqual(request_upgradeHead.toString('utf8'), 'WjN}|M(6'); conn.write('test', 'utf8'); } else if (state === 2) { @@ -133,7 +133,7 @@ function test_upgrade_no_listener() { conn.once('data', (data) => { assert.strictEqual(typeof data, 'string'); - assert.strictEqual(data.substr(0, 12), 'HTTP/1.1 200'); + assert.strictEqual(data.slice(0, 12), 'HTTP/1.1 200'); conn.end(); }); @@ -153,7 +153,7 @@ function test_standard_http() { conn.once('data', function(data) { assert.strictEqual(typeof data, 'string'); - assert.strictEqual(data.substr(0, 12), 'HTTP/1.1 200'); + assert.strictEqual(data.slice(0, 12), 'HTTP/1.1 200'); conn.end(); }); diff --git a/test/parallel/test-path-dirname.js b/test/parallel/test-path-dirname.js index d085cecb24f069..0d4a182884ad0c 100644 --- a/test/parallel/test-path-dirname.js +++ b/test/parallel/test-path-dirname.js @@ -3,7 +3,7 @@ const common = require('../common'); const assert = require('assert'); const path = require('path'); -assert.strictEqual(path.dirname(__filename).substr(-13), +assert.strictEqual(path.dirname(__filename).slice(-13), common.isWindows ? 'test\\parallel' : 'test/parallel'); assert.strictEqual(path.posix.dirname('/a/b/'), '/a'); diff --git a/test/parallel/test-repl-tab-complete.js b/test/parallel/test-repl-tab-complete.js index 06a55414d5beb5..f5e42cb41d4621 100644 --- a/test/parallel/test-repl-tab-complete.js +++ b/test/parallel/test-repl-tab-complete.js @@ -584,7 +584,7 @@ testMe.complete('obj.', common.mustCall(function(error, data) { data[0].forEach((key) => { if (!key || key === 'ele.biu') return; - assert.notStrictEqual(ele[key.substr(4)], undefined); + assert.notStrictEqual(ele[key.slice(4)], undefined); }); })); }); diff --git a/test/parallel/test-repl.js b/test/parallel/test-repl.js index b798ad71a0e960..44454127dcc5b8 100644 --- a/test/parallel/test-repl.js +++ b/test/parallel/test-repl.js @@ -64,7 +64,7 @@ async function runReplTests(socket, prompt, tests) { // Cut away the initial prompt while (lineBuffer.startsWith(prompt)) - lineBuffer = lineBuffer.substr(prompt.length); + lineBuffer = lineBuffer.slice(prompt.length); // Allow to match partial text if no newline was received, because // sending newlines from the REPL itself would be redundant @@ -76,13 +76,13 @@ async function runReplTests(socket, prompt, tests) { // Split off the current line. const newlineOffset = lineBuffer.indexOf('\n'); - let actualLine = lineBuffer.substr(0, newlineOffset); - lineBuffer = lineBuffer.substr(newlineOffset + 1); + let actualLine = lineBuffer.slice(0, newlineOffset); + lineBuffer = lineBuffer.slice(newlineOffset + 1); // This might have been skipped in the loop above because the buffer // already contained a \n to begin with and the entire loop was skipped. while (actualLine.startsWith(prompt)) - actualLine = actualLine.substr(prompt.length); + actualLine = actualLine.slice(prompt.length); console.error('in:', JSON.stringify(actualLine)); diff --git a/test/parallel/test-webcrypto-digest.js b/test/parallel/test-webcrypto-digest.js index f09e1815078ed7..bfd01ecc12b63e 100644 --- a/test/parallel/test-webcrypto-digest.js +++ b/test/parallel/test-webcrypto-digest.js @@ -156,7 +156,7 @@ async function testDigest(size, name) { Object.keys(kDigestedData).forEach((alg) => { const upCase = alg.toUpperCase(); const downCase = alg.toLowerCase(); - const mixedCase = upCase.substr(0, 1) + downCase.substr(1); + const mixedCase = upCase.slice(0, 1) + downCase.slice(1); variations.push(testDigest(size, upCase)); variations.push(testDigest(size, downCase)); diff --git a/test/parallel/test-zlib-truncated.js b/test/parallel/test-zlib-truncated.js index 8e6768c21d0408..94bc0e21cb7a5f 100644 --- a/test/parallel/test-zlib-truncated.js +++ b/test/parallel/test-zlib-truncated.js @@ -52,13 +52,13 @@ const errMessage = /unexpected end of file/; // Sync truncated input test, finishFlush = Z_SYNC_FLUSH const result = toUTF8(zlib[methods.decompSync](truncated, syncFlushOpt)); - assert.strictEqual(result, inputString.substr(0, result.length)); + assert.strictEqual(result, inputString.slice(0, result.length)); // Async truncated input test, finishFlush = Z_SYNC_FLUSH zlib[methods.decomp](truncated, syncFlushOpt, function(err, decompressed) { assert.ifError(err); const result = toUTF8(decompressed); - assert.strictEqual(result, inputString.substr(0, result.length)); + assert.strictEqual(result, inputString.slice(0, result.length)); }); }); });