Skip to content

Commit

Permalink
test: replace indexOf with includes and startsWith
Browse files Browse the repository at this point in the history
PR-URL: #13852
Refs: #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>
  • Loading branch information
Nataly Shrits authored and addaleax committed Jul 11, 2017
1 parent bd7da17 commit 3e4b450
Show file tree
Hide file tree
Showing 22 changed files with 40 additions and 43 deletions.
2 changes: 1 addition & 1 deletion test/addons/repl-domain-abort/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
};
Expand Down
2 changes: 1 addition & 1 deletion test/disabled/test-sendfd.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});
Expand Down
8 changes: 4 additions & 4 deletions test/doctool/test-doctool-html.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}
}));
Expand Down
2 changes: 1 addition & 1 deletion test/internet/test-dns-any.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
},
Expand Down
2 changes: 1 addition & 1 deletion test/internet/test-dns.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
});

Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-buffer-write.js
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-child-process-exec-cwd.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 1 addition & 1 deletion test/parallel/test-console.js
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-dgram-error-message-address.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
7 changes: 2 additions & 5 deletions test/parallel/test-domain-top-level-error-handler-throw.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-domain-uncaught-exception.js
Original file line number Diff line number Diff line change
Expand Up @@ -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`);
}
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-http-keepalive-maxsockets.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions test/parallel/test-http-methods.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 1 addition & 1 deletion test/parallel/test-http-write-head.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,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();
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-net-server-connections.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 1 addition & 1 deletion test/parallel/test-path-parse-format.js
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,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;
}
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-process-getgroups.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
22 changes: 11 additions & 11 deletions test/parallel/test-repl-tab-complete.js
Original file line number Diff line number Diff line change
Expand Up @@ -207,15 +207,15 @@ 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`);
});
}));

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)
Expand Down Expand Up @@ -260,19 +260,19 @@ 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
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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-tls-interleave.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions test/pummel/test-dtrace-jsstack.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion test/pummel/test-regress-GH-814.js
Original file line number Diff line number Diff line change
Expand Up @@ -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('.');
}


Expand Down
2 changes: 1 addition & 1 deletion test/pummel/test-regress-GH-814_2.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down

0 comments on commit 3e4b450

Please sign in to comment.