Skip to content

Commit 1f32d9e

Browse files
vsemozhetbytaddaleax
vsemozhetbyt
authored and
addaleax
committed
test: fix RegExp nits
* Remove needless RegExp flag In fixed case, `/g` flag is needless in the boolean context. * Remove needless RegExp capturing Use non-capturing grouping or remove capturing completely when: * capturing is useless per se, e.g. in test() check; * captured groups are not used afterward at all; * some of the later captured groups are not used afterward. * Use test, not match/exec in boolean context match() and exec() return a complicated object, unneeded in a boolean context. * Do not needlessly repeat RegExp creation This commit takes RegExp creation out of cycles and other repetitions. As long as the RegExp does not use /g flag and match indices, we are safe here. In tests, this fix hardly gives a significant performance gain, but it increases clarity and maintainability, reassuring some RegExps to be identical. RegExp in functions are not taken out of their functions: while these functions are called many times and their RegExps are recreated with each call, the performance gain in test cases does not seem to be worth decreasing function self-dependency. PR-URL: #13770 Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
1 parent 1fe455f commit 1f32d9e

File tree

56 files changed

+301
-244
lines changed

Some content is hidden

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

56 files changed

+301
-244
lines changed

‎test/common/index.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,9 @@ if (exports.isWindows) {
267267
}
268268

269269
const ifaces = os.networkInterfaces();
270+
const re = /lo/;
270271
exports.hasIPv6 = Object.keys(ifaces).some(function(name) {
271-
return /lo/.test(name) && ifaces[name].some(function(info) {
272+
return re.test(name) && ifaces[name].some(function(info) {
272273
return info.family === 'IPv6';
273274
});
274275
});
@@ -433,7 +434,7 @@ function leakedGlobals() {
433434
leaked.push(val);
434435

435436
if (global.__coverage__) {
436-
return leaked.filter((varname) => !/^(cov_|__cov)/.test(varname));
437+
return leaked.filter((varname) => !/^(?:cov_|__cov)/.test(varname));
437438
} else {
438439
return leaked;
439440
}

‎test/debugger/helper-debugger-repl.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ function startDebugger(scriptToDebug) {
5151
child.stderr.pipe(process.stderr);
5252

5353
child.on('line', function(line) {
54-
line = line.replace(/^(debug> *)+/, '');
54+
line = line.replace(/^(?:debug> *)+/, '');
5555
console.log(line);
5656
assert.ok(expected.length > 0, `Got unexpected line: ${line}`);
5757

5858
const expectedLine = expected[0].lines.shift();
59-
assert.ok(line.match(expectedLine) !== null, `${line} != ${expectedLine}`);
59+
assert.ok(expectedLine.test(line), `${line} != ${expectedLine}`);
6060

6161
if (expected[0].lines.length === 0) {
6262
const callback = expected[0].callback;

‎test/doctool/test-doctool-html.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,11 @@ const testData = [
9191
},
9292
];
9393

94+
const spaces = /\s/g;
95+
9496
testData.forEach((item) => {
9597
// Normalize expected data by stripping whitespace
96-
const expected = item.html.replace(/\s/g, '');
98+
const expected = item.html.replace(spaces, '');
9799
const includeAnalytics = typeof item.analyticsId !== 'undefined';
98100

99101
fs.readFile(item.file, 'utf8', common.mustCall((err, input) => {
@@ -112,7 +114,7 @@ testData.forEach((item) => {
112114
common.mustCall((err, output) => {
113115
assert.ifError(err);
114116

115-
const actual = output.replace(/\s/g, '');
117+
const actual = output.replace(spaces, '');
116118
// Assert that the input stripped of all whitespace contains the
117119
// expected list
118120
assert.notStrictEqual(actual.indexOf(expected), -1);

‎test/inspector/inspector-helper.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -521,11 +521,11 @@ exports.startNodeForInspectorTest = function(callback,
521521
clearTimeout(timeoutId);
522522
console.log('[err]', text);
523523
if (found) return;
524-
const match = text.match(/Debugger listening on ws:\/\/(.+):(\d+)\/(.+)/);
524+
const match = text.match(/Debugger listening on ws:\/\/.+:(\d+)\/.+/);
525525
found = true;
526526
child.stderr.removeListener('data', dataCallback);
527527
assert.ok(match, text);
528-
callback(new Harness(match[2], child));
528+
callback(new Harness(match[1], child));
529529
});
530530

531531
child.stderr.on('data', dataCallback);

‎test/inspector/test-inspector.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ function checkListResponse(err, response) {
1313
assert.strictEqual(1, response.length);
1414
assert.ok(response[0]['devtoolsFrontendUrl']);
1515
assert.ok(
16-
response[0]['webSocketDebuggerUrl']
17-
.match(/ws:\/\/127\.0\.0\.1:\d+\/[0-9A-Fa-f]{8}-/));
16+
/ws:\/\/127\.0\.0\.1:\d+\/[0-9A-Fa-f]{8}-/
17+
.test(response[0]['webSocketDebuggerUrl']));
1818
}
1919

2020
function checkVersion(err, response) {

‎test/parallel/test-assert-checktag.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@ const util = require('util');
77
// for assert.throws()
88
function re(literals, ...values) {
99
let result = literals[0];
10+
const escapeRE = /[\\^$.*+?()[\]{}|=!<>:-]/g;
1011
for (const [i, value] of values.entries()) {
1112
const str = util.inspect(value);
1213
// Need to escape special characters.
13-
result += str.replace(/[\\^$.*+?()[\]{}|=!<>:-]/g, '\\$&');
14+
result += str.replace(escapeRE, '\\$&');
1415
result += literals[i + 1];
1516
}
1617
return common.expectsError({

‎test/parallel/test-assert-deep.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@ const util = require('util');
77
// for assert.throws()
88
function re(literals, ...values) {
99
let result = literals[0];
10+
const escapeRE = /[\\^$.*+?()[\]{}|=!<>:-]/g;
1011
for (const [i, value] of values.entries()) {
1112
const str = util.inspect(value);
1213
// Need to escape special characters.
13-
result += str.replace(/[\\^$.*+?()[\]{}|=!<>:-]/g, '\\$&');
14+
result += str.replace(escapeRE, '\\$&');
1415
result += literals[i + 1];
1516
}
1617
return common.expectsError({

‎test/parallel/test-assert.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -722,13 +722,14 @@ assert.throws(() => {
722722
{
723723
// bad args to AssertionError constructor should throw TypeError
724724
const args = [1, true, false, '', null, Infinity, Symbol('test'), undefined];
725+
const re = /^The "options" argument must be of type object$/;
725726
args.forEach((input) => {
726727
assert.throws(
727728
() => new assert.AssertionError(input),
728729
common.expectsError({
729730
code: 'ERR_INVALID_ARG_TYPE',
730731
type: TypeError,
731-
message: /^The "options" argument must be of type object$/
732+
message: re
732733
}));
733734
});
734735
}

‎test/parallel/test-buffer-bytelength.js‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,11 @@ const SlowBuffer = require('buffer').SlowBuffer;
77
const vm = require('vm');
88

99
// coerce values to string
10-
assert.throws(() => { Buffer.byteLength(32, 'latin1'); },
11-
/"string" must be a string, Buffer, or ArrayBuffer/);
12-
assert.throws(() => { Buffer.byteLength(NaN, 'utf8'); },
13-
/"string" must be a string, Buffer, or ArrayBuffer/);
14-
assert.throws(() => { Buffer.byteLength({}, 'latin1'); },
15-
/"string" must be a string, Buffer, or ArrayBuffer/);
16-
assert.throws(() => { Buffer.byteLength(); },
17-
/"string" must be a string, Buffer, or ArrayBuffer/);
10+
const re = /"string" must be a string, Buffer, or ArrayBuffer/;
11+
assert.throws(() => { Buffer.byteLength(32, 'latin1'); }, re);
12+
assert.throws(() => { Buffer.byteLength(NaN, 'utf8'); }, re);
13+
assert.throws(() => { Buffer.byteLength({}, 'latin1'); }, re);
14+
assert.throws(() => { Buffer.byteLength(); }, re);
1815

1916
assert.strictEqual(Buffer.byteLength('', undefined, true), -1);
2017

‎test/parallel/test-buffer-prototype-inspect.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ const util = require('util');
1919

2020
{
2121
const buf = Buffer.from('x'.repeat(51));
22-
assert.ok(/^<Buffer (78 ){50}\.\.\. >$/.test(util.inspect(buf)));
22+
assert.ok(/^<Buffer (?:78 ){50}\.\.\. >$/.test(util.inspect(buf)));
2323
}

0 commit comments

Comments
 (0)