1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test: replace indexOf with includes and startsWith

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/13852
Refs: https://github.com/nodejs/node/issues/12586
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Vse Mozhet Byt <vsemozhetbyt@gmail.com>
This commit is contained in:
Nataly Shrits 2017-06-21 21:09:37 +03:00 committed by Tobias Nießen
parent ea927b3711
commit 20b00f3a36
22 changed files with 40 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/addons/repl-domain-abort/test.js
View File

@ -54,7 +54,7 @@ dInput._read = function _read(size) {
};
dOutput._write = function _write(chunk, encoding, cb) {
if (chunk.toString().indexOf('cb_ran') === 0)
if (chunk.toString().startsWith('cb_ran'))
cb_ran = true;
cb();
};

2
test/disabled/test-sendfd.js
View File

@ -93,7 +93,7 @@ pipeReadStream.on('data', function(data) {
var rd = JSON.parse(d);
assert.strictEqual(rd.pid, cpp);
assert.strictEqual(seenOrdinals.indexOf(rd.ord), -1);
assert.strictEqual(seenOrdinals.includes(rd.ord), false)
seenOrdinals.unshift(rd.ord);
});

8
test/doctool/test-doctool-html.js
View File

@ -117,15 +117,15 @@ testData.forEach((item) => {
const actual = output.replace(spaces, '');
// Assert that the input stripped of all whitespace contains the
// expected list
assert.notStrictEqual(actual.indexOf(expected), -1);
assert(actual.includes(expected));
// Testing the insertion of Google Analytics script when
// an analytics id is provided. Should not be present by default
if (includeAnalytics) {
assert.notStrictEqual(actual.indexOf('google-analytics.com'), -1,
'Google Analytics script was not present');
assert(actual.includes('google-analytics.com'),
'Google Analytics script was not present');
} else {
assert.strictEqual(actual.indexOf('google-analytics.com'), -1,
assert.strictEqual(actual.includes('google-analytics.com'), false,
'Google Analytics script was present');
}
}));

2
test/internet/test-dns-any.js
View File

@ -60,7 +60,7 @@ const checkers = {
assert.ok(Array.isArray(r.entries));
assert.ok(r.entries.length > 0);
r.entries.forEach((txt) => {
assert.strictEqual(txt.indexOf('v=spf1'), 0);
assert(txt.startsWith('v=spf1'));
});
assert.strictEqual(r.type, 'TXT');
},

2
test/internet/test-dns.js
View File

@ -366,7 +366,7 @@ TEST(function test_resolveTxt(done) {
assert.ifError(err);
assert.strictEqual(records.length, 1);
assert.ok(util.isArray(records[0]));
assert.strictEqual(records[0][0].indexOf('v=spf1'), 0);
assert(records[0][0].startsWith('v=spf1'));
done();
});

2
test/parallel/test-buffer-write.js
View File

@ -30,7 +30,7 @@ encodings
const len = Buffer.byteLength('foo', encoding);
assert.strictEqual(buf.write('foo', 0, len, encoding), len);
if (encoding.indexOf('-') !== -1)
if (encoding.includes('-'))
encoding = encoding.replace('-', '');
assert.deepStrictEqual(buf, resultMap.get(encoding.toLowerCase()));

2
test/parallel/test-child-process-exec-cwd.js
View File

@ -36,5 +36,5 @@ if (common.isWindows) {
exec(pwdcommand, {cwd: dir}, common.mustCall(function(err, stdout, stderr) {
assert.ifError(err);
assert.strictEqual(stdout.indexOf(dir), 0);
assert(stdout.startsWith(dir));
}));

2
test/parallel/test-console.js
View File

@ -137,7 +137,7 @@ assert.strictEqual("{ foo: 'bar', inspect: [Function: inspect] }\n",
assert.strictEqual("{ foo: 'bar', inspect: [Function: inspect] }\n",
strings.shift());
assert.ok(strings.shift().includes('foo: [Object]'));
assert.strictEqual(-1, strings.shift().indexOf('baz'));
assert.strictEqual(strings.shift().includes('baz'), false);
assert.ok(/^label: \d+\.\d{3}ms$/.test(strings.shift().trim()));
assert.ok(/^__proto__: \d+\.\d{3}ms$/.test(strings.shift().trim()));
assert.ok(/^constructor: \d+\.\d{3}ms$/.test(strings.shift().trim()));

2
test/parallel/test-dgram-error-message-address.js
View File

@ -47,7 +47,7 @@ socket_ipv6.on('listening', common.mustNotCall());
socket_ipv6.on('error', common.mustCall(function(e) {
// EAFNOSUPPORT or EPROTONOSUPPORT means IPv6 is disabled on this system.
const allowed = ['EADDRNOTAVAIL', 'EAFNOSUPPORT', 'EPROTONOSUPPORT'];
assert.notStrictEqual(allowed.indexOf(e.code), -1);
assert(allowed.includes(e.code));
assert.strictEqual(e.port, undefined);
assert.strictEqual(e.message, `bind ${e.code} 111::1`);
assert.strictEqual(e.address, '111::1');

7
test/parallel/test-domain-top-level-error-handler-throw.js
View File

@ -37,11 +37,8 @@ if (process.argv[2] === 'child') {
});
child.on('close', function onChildClosed() {
assert.notStrictEqual(
stderrOutput.indexOf(domainErrHandlerExMessage),
-1
);
assert.strictEqual(stderrOutput.indexOf(internalExMessage), -1);
assert(stderrOutput.includes(domainErrHandlerExMessage));
assert.strictEqual(stderrOutput.includes(internalExMessage), false);
});
child.on('exit', function onChildExited(exitCode, signal) {

2
test/parallel/test-domain-uncaught-exception.js
View File

@ -191,7 +191,7 @@ if (process.argv[2] === 'child') {
if (test.messagesReceived) {
test.messagesReceived.forEach(function(receivedMessage) {
if (test.expectedMessages.indexOf(receivedMessage) === -1) {
if (!test.expectedMessages.includes(receivedMessage)) {
assert.fail(`test ${test.fn.name} should not have sent message: ${
receivedMessage} but did`);
}

2
test/parallel/test-http-keepalive-maxsockets.js
View File

@ -28,7 +28,7 @@ const http = require('http');
const serverSockets = [];
const server = http.createServer(function(req, res) {
if (serverSockets.indexOf(req.socket) === -1) {
if (!serverSockets.includes(req.socket)) {
serverSockets.push(req.socket);
}
res.end(req.url);

6
test/parallel/test-http-methods.js
View File

@ -27,7 +27,7 @@ const util = require('util');
assert(Array.isArray(http.METHODS));
assert(http.METHODS.length > 0);
assert.notStrictEqual(http.METHODS.indexOf('GET'), -1);
assert.notStrictEqual(http.METHODS.indexOf('HEAD'), -1);
assert.notStrictEqual(http.METHODS.indexOf('POST'), -1);
assert(http.METHODS.includes('GET'));
assert(http.METHODS.includes('HEAD'));
assert(http.METHODS.includes('POST'));
assert.deepStrictEqual(util._extend([], http.METHODS), http.METHODS.sort());

2
test/parallel/test-http-write-head.js
View File

@ -72,7 +72,7 @@ function runTest() {
http.get({ port: this.address().port }, common.mustCall((response) => {
response.on('end', common.mustCall(() => {
assert.strictEqual(response.headers['test'], '2');
assert.notStrictEqual(response.rawHeaders.indexOf('Test'), -1);
assert(response.rawHeaders.includes('Test'));
s.close();
}));
response.resume();

2
test/parallel/test-net-server-connections.js
View File

@ -34,6 +34,6 @@ common.expectWarning('DeprecationWarning', expectedWarning);
// test that server.connections property is no longer enumerable now that it
// has been marked as deprecated
assert.strictEqual(Object.keys(server).indexOf('connections'), -1);
assert.strictEqual(Object.keys(server).includes('connections'), false);
assert.strictEqual(server.connections, 0);

2
test/parallel/test-path-parse-format.js
View File

@ -157,7 +157,7 @@ trailingTests.forEach(function(test) {
if (!failed) {
for (let i = 0; i < actualKeys.length; ++i) {
const key = actualKeys[i];
if (expectedKeys.indexOf(key) === -1 || actual[key] !== expected[key]) {
if (!expectedKeys.includes(key) || actual[key] !== expected[key]) {
failed = true;
break;
}

2
test/parallel/test-process-getgroups.js
View File

@ -45,7 +45,7 @@ if (typeof process.getgroups === 'function') {
}
function check(a, b) {
for (let i = 0; i < a.length; ++i) assert.notStrictEqual(b.indexOf(a[i]), -1);
for (let i = 0; i < a.length; ++i) assert(b.includes(a[i]));
}
function unique(groups) {

22
test/parallel/test-repl-tab-complete.js
View File

@ -207,7 +207,7 @@ putIn.run(['.clear']);
testMe.complete('require(\'', common.mustCall(function(error, data) {
assert.strictEqual(error, null);
repl._builtinLibs.forEach(function(lib) {
assert.notStrictEqual(data[0].indexOf(lib), -1, `${lib} not found`);
assert(data[0].includes(lib), `${lib} not found`);
});
}));
@ -215,7 +215,7 @@ testMe.complete('require(\'n', common.mustCall(function(error, data) {
assert.strictEqual(error, null);
assert.strictEqual(data.length, 2);
assert.strictEqual(data[1], 'n');
assert.notStrictEqual(data[0].indexOf('net'), -1);
assert(data[0].includes('net'));
// It's possible to pick up non-core modules too
data[0].forEach(function(completion) {
if (completion)
@ -260,9 +260,9 @@ putIn.run(['.clear']);
putIn.run(['var ary = [1,2,3];']);
testMe.complete('ary.', common.mustCall(function(error, data) {
assert.strictEqual(data[0].indexOf('ary.0'), -1);
assert.strictEqual(data[0].indexOf('ary.1'), -1);
assert.strictEqual(data[0].indexOf('ary.2'), -1);
assert.strictEqual(data[0].includes('ary.0'), false);
assert.strictEqual(data[0].includes('ary.1'), false);
assert.strictEqual(data[0].includes('ary.2'), false);
}));
// Make sure tab completion does not include integer keys in an object
@ -270,9 +270,9 @@ putIn.run(['.clear']);
putIn.run(['var obj = {1:"a","1a":"b",a:"b"};']);
testMe.complete('obj.', common.mustCall(function(error, data) {
assert.strictEqual(data[0].indexOf('obj.1'), -1);
assert.strictEqual(data[0].indexOf('obj.1a'), -1);
assert.notStrictEqual(data[0].indexOf('obj.a'), -1);
assert.strictEqual(data[0].includes('obj.1'), false);
assert.strictEqual(data[0].includes('obj.1a'), false);
assert(data[0].includes('obj.a'));
}));
// Don't try to complete results of non-simple expressions
@ -286,9 +286,9 @@ putIn.run(['.clear']);
putIn.run(['var obj = {1:"a","1a":"b",a:"b"};']);
testMe.complete(' obj.', common.mustCall((error, data) => {
assert.strictEqual(data[0].indexOf('obj.1'), -1);
assert.strictEqual(data[0].indexOf('obj.1a'), -1);
assert.notStrictEqual(data[0].indexOf('obj.a'), -1);
assert.strictEqual(data[0].includes('obj.1'), false);
assert.strictEqual(data[0].includes('obj.1a'), false);
assert(data[0].includes('obj.a'));
}));
// Works inside assignments

2
test/parallel/test-tls-interleave.js
View File

@ -59,7 +59,7 @@ const server = tls.createServer(options, function(c) {
data = data.toString();
while (data.length !== 0) {
assert.strictEqual(data.indexOf(writes[receivedWrites]), 0);
assert(data.startsWith(writes[receivedWrites]));
data = data.slice(writes[receivedWrites].length);
if (++receivedWrites === writes.length) {

6
test/pummel/test-dtrace-jsstack.js
View File

@ -86,14 +86,14 @@ dtrace.on('exit', function(code) {
for (let i = 0; i < lines.length; i++) {
const line = lines[i];
if (line.indexOf(sentinel) === -1 || frames.length === 0)
if (!line.includes(sentinel) || frames.length === 0)
continue;
const frame = line.substr(line.indexOf(sentinel) + sentinel.length);
const top = frames.shift();
assert.strictEqual(frame.indexOf(top), 0,
`unexpected frame where ${top} was expected`);
assert(frame.startsWith(top),
`unexpected frame where ${top} was expected`);
}
assert.strictEqual(frames.length, 0,

2
test/pummel/test-regress-GH-814.js
View File

@ -51,7 +51,7 @@ const tail = require('child_process').spawn('tail', ['-f', testFileName]);
tail.stdout.on('data', tailCB);
function tailCB(data) {
PASS = data.toString().indexOf('.') < 0;
PASS = !data.toString().includes('.');
}

2
test/pummel/test-regress-GH-814_2.js
View File

@ -35,7 +35,7 @@ const tailProc = require('child_process').spawn('tail', ['-f', testFileName]);
tailProc.stdout.on('data', tailCB);
function tailCB(data) {
PASS = data.toString().indexOf('.') < 0;
PASS = !data.toString().includes('.');
if (PASS) {
//console.error('i');