Skip to content

Commit 02b12fe

Browse files
Trottcjihrig
Trott
authored and
cjihrig
committed
test: improve chained property readability
A new version of ESLint flags chained properties on multiple lines that were not flagged by the previous version of ESLint. In preparation for turning that feature on, adjust alignment to that expected by the linter. This change happened to be predominantly around assertions using `assert()` and `assert.equal()`. These were changed to `assert.strictEqual()` where possible. PR-URL: #7920 Reviewed-By: Michaël Zasso <mic.besace@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Conflicts: test/parallel/test-readline-interface.js
1 parent d94063a commit 02b12fe

7 files changed

+188
-124
lines changed

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

Lines changed: 50 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -79,44 +79,64 @@ assert(!b.includes(Buffer.from('f'), 6));
7979
assert(!Buffer.from('ff').includes(Buffer.from('f'), 1, 'ucs2'));
8080

8181
// test hex encoding
82-
assert(
83-
Buffer.from(b.toString('hex'), 'hex')
84-
.includes('64', 0, 'hex'));
85-
assert(
86-
Buffer.from(b.toString('hex'), 'hex')
87-
.includes(Buffer.from('64', 'hex'), 0, 'hex'));
82+
assert.strictEqual(
83+
Buffer.from(b.toString('hex'), 'hex')
84+
.includes('64', 0, 'hex'),
85+
true
86+
);
87+
assert.strictEqual(
88+
Buffer.from(b.toString('hex'), 'hex')
89+
.includes(Buffer.from('64', 'hex'), 0, 'hex'),
90+
true
91+
);
8892

8993
// test base64 encoding
90-
assert(
91-
Buffer.from(b.toString('base64'), 'base64')
92-
.includes('ZA==', 0, 'base64'));
93-
assert(
94-
Buffer.from(b.toString('base64'), 'base64')
95-
.includes(Buffer.from('ZA==', 'base64'), 0, 'base64'));
94+
assert.strictEqual(
95+
Buffer.from(b.toString('base64'), 'base64')
96+
.includes('ZA==', 0, 'base64'),
97+
true
98+
);
99+
assert.strictEqual(
100+
Buffer.from(b.toString('base64'), 'base64')
101+
.includes(Buffer.from('ZA==', 'base64'), 0, 'base64'),
102+
true
103+
);
96104

97105
// test ascii encoding
98-
assert(
99-
Buffer.from(b.toString('ascii'), 'ascii')
100-
.includes('d', 0, 'ascii'));
101-
assert(
102-
Buffer.from(b.toString('ascii'), 'ascii')
103-
.includes(Buffer.from('d', 'ascii'), 0, 'ascii'));
106+
assert.strictEqual(
107+
Buffer.from(b.toString('ascii'), 'ascii')
108+
.includes('d', 0, 'ascii'),
109+
true
110+
);
111+
assert.strictEqual(
112+
Buffer.from(b.toString('ascii'), 'ascii')
113+
.includes(Buffer.from('d', 'ascii'), 0, 'ascii'),
114+
true
115+
);
104116

105117
// test latin1 encoding
106-
assert(
107-
Buffer.from(b.toString('latin1'), 'latin1')
108-
.includes('d', 0, 'latin1'));
109-
assert(
110-
Buffer.from(b.toString('latin1'), 'latin1')
111-
.includes(Buffer.from('d', 'latin1'), 0, 'latin1'));
118+
assert.strictEqual(
119+
Buffer.from(b.toString('latin1'), 'latin1')
120+
.includes('d', 0, 'latin1'),
121+
true
122+
);
123+
assert.strictEqual(
124+
Buffer.from(b.toString('latin1'), 'latin1')
125+
.includes(Buffer.from('d', 'latin1'), 0, 'latin1'),
126+
true
127+
);
112128

113129
// test binary encoding
114-
assert(
115-
Buffer.from(b.toString('binary'), 'binary')
116-
.includes('d', 0, 'binary'));
117-
assert(
118-
Buffer.from(b.toString('binary'), 'binary')
119-
.includes(Buffer.from('d', 'binary'), 0, 'binary'));
130+
assert.strictEqual(
131+
Buffer.from(b.toString('binary'), 'binary')
132+
.includes('d', 0, 'binary'),
133+
true
134+
);
135+
assert.strictEqual(
136+
Buffer.from(b.toString('binary'), 'binary')
137+
.includes(Buffer.from('d', 'binary'), 0, 'binary'),
138+
true
139+
);
120140

121141

122142
// test usc2 encoding

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

Lines changed: 80 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -79,62 +79,94 @@ assert.equal(b.indexOf(Buffer.from('f'), 6), -1);
7979
assert.equal(Buffer.from('ff').indexOf(Buffer.from('f'), 1, 'ucs2'), -1);
8080

8181
// test hex encoding
82-
assert.equal(
83-
Buffer.from(b.toString('hex'), 'hex')
84-
.indexOf('64', 0, 'hex'), 3);
85-
assert.equal(
86-
Buffer.from(b.toString('hex'), 'hex')
87-
.indexOf(Buffer.from('64', 'hex'), 0, 'hex'), 3);
82+
assert.strictEqual(
83+
Buffer.from(b.toString('hex'), 'hex')
84+
.indexOf('64', 0, 'hex'),
85+
3
86+
);
87+
assert.strictEqual(
88+
Buffer.from(b.toString('hex'), 'hex')
89+
.indexOf(Buffer.from('64', 'hex'), 0, 'hex'),
90+
3
91+
);
8892

8993
// test base64 encoding
90-
assert.equal(
91-
Buffer.from(b.toString('base64'), 'base64')
92-
.indexOf('ZA==', 0, 'base64'), 3);
93-
assert.equal(
94-
Buffer.from(b.toString('base64'), 'base64')
95-
.indexOf(Buffer.from('ZA==', 'base64'), 0, 'base64'), 3);
94+
assert.strictEqual(
95+
Buffer.from(b.toString('base64'), 'base64')
96+
.indexOf('ZA==', 0, 'base64'),
97+
3
98+
);
99+
assert.strictEqual(
100+
Buffer.from(b.toString('base64'), 'base64')
101+
.indexOf(Buffer.from('ZA==', 'base64'), 0, 'base64'),
102+
3
103+
);
96104

97105
// test ascii encoding
98-
assert.equal(
99-
Buffer.from(b.toString('ascii'), 'ascii')
100-
.indexOf('d', 0, 'ascii'), 3);
101-
assert.equal(
102-
Buffer.from(b.toString('ascii'), 'ascii')
103-
.indexOf(Buffer.from('d', 'ascii'), 0, 'ascii'), 3);
106+
assert.strictEqual(
107+
Buffer.from(b.toString('ascii'), 'ascii')
108+
.indexOf('d', 0, 'ascii'),
109+
3
110+
);
111+
assert.strictEqual(
112+
Buffer.from(b.toString('ascii'), 'ascii')
113+
.indexOf(Buffer.from('d', 'ascii'), 0, 'ascii'),
114+
3
115+
);
104116

105117
// test latin1 encoding
106-
assert.equal(
107-
Buffer.from(b.toString('latin1'), 'latin1')
108-
.indexOf('d', 0, 'latin1'), 3);
109-
assert.equal(
110-
Buffer.from(b.toString('latin1'), 'latin1')
111-
.indexOf(Buffer.from('d', 'latin1'), 0, 'latin1'), 3);
112-
assert.equal(
113-
Buffer.from('aa\u00e8aa', 'latin1')
114-
.indexOf('\u00e8', 'latin1'), 2);
115-
assert.equal(
116-
Buffer.from('\u00e8', 'latin1')
117-
.indexOf('\u00e8', 'latin1'), 0);
118-
assert.equal(
119-
Buffer.from('\u00e8', 'latin1')
120-
.indexOf(Buffer.from('\u00e8', 'latin1'), 'latin1'), 0);
118+
assert.strictEqual(
119+
Buffer.from(b.toString('latin1'), 'latin1')
120+
.indexOf('d', 0, 'latin1'),
121+
3
122+
);
123+
assert.strictEqual(
124+
Buffer.from(b.toString('latin1'), 'latin1')
125+
.indexOf(Buffer.from('d', 'latin1'), 0, 'latin1'),
126+
3
127+
);
128+
assert.strictEqual(
129+
Buffer.from('aa\u00e8aa', 'latin1')
130+
.indexOf('\u00e8', 'latin1'),
131+
2
132+
);
133+
assert.strictEqual(
134+
Buffer.from('\u00e8', 'latin1')
135+
.indexOf('\u00e8', 'latin1'),
136+
0
137+
);
138+
assert.strictEqual(
139+
Buffer.from('\u00e8', 'latin1')
140+
.indexOf(Buffer.from('\u00e8', 'latin1'), 'latin1'),
141+
0
142+
);
121143

122144
// test binary encoding
123-
assert.equal(
124-
Buffer.from(b.toString('binary'), 'binary')
125-
.indexOf('d', 0, 'binary'), 3);
126-
assert.equal(
127-
Buffer.from(b.toString('binary'), 'binary')
128-
.indexOf(Buffer.from('d', 'binary'), 0, 'binary'), 3);
129-
assert.equal(
130-
Buffer.from('aa\u00e8aa', 'binary')
131-
.indexOf('\u00e8', 'binary'), 2);
132-
assert.equal(
133-
Buffer.from('\u00e8', 'binary')
134-
.indexOf('\u00e8', 'binary'), 0);
135-
assert.equal(
136-
Buffer.from('\u00e8', 'binary')
137-
.indexOf(Buffer.from('\u00e8', 'binary'), 'binary'), 0);
145+
assert.strictEqual(
146+
Buffer.from(b.toString('binary'), 'binary')
147+
.indexOf('d', 0, 'binary'),
148+
3
149+
);
150+
assert.strictEqual(
151+
Buffer.from(b.toString('binary'), 'binary')
152+
.indexOf(Buffer.from('d', 'binary'), 0, 'binary'),
153+
3
154+
);
155+
assert.strictEqual(
156+
Buffer.from('aa\u00e8aa', 'binary')
157+
.indexOf('\u00e8', 'binary'),
158+
2
159+
);
160+
assert.strictEqual(
161+
Buffer.from('\u00e8', 'binary')
162+
.indexOf('\u00e8', 'binary'),
163+
0
164+
);
165+
assert.strictEqual(
166+
Buffer.from('\u00e8', 'binary')
167+
.indexOf(Buffer.from('\u00e8', 'binary'), 'binary'),
168+
0
169+
);
138170

139171

140172
// test optional offset with passed encoding

‎test/parallel/test-cluster-worker-forced-exit.js‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,16 @@ checkForced();
2929

3030
function checkUnforced() {
3131
cluster.fork()
32-
.on('online', function() {
33-
this.disconnect();
34-
})
35-
.on('exit', common.mustCall(function(status) {
36-
assert.equal(status, SENTINEL);
37-
}));
32+
.on('online', function() { this.disconnect(); })
33+
.on('exit', common.mustCall(function(status) {
34+
assert.strictEqual(status, SENTINEL);
35+
}));
3836
}
3937

4038
function checkForced() {
4139
cluster.fork()
42-
.on('online', function() {
43-
this.process.disconnect();
44-
})
45-
.on('exit', common.mustCall(function(status) {
46-
assert.equal(status, 0);
47-
}));
40+
.on('online', function() { this.process.disconnect(); })
41+
.on('exit', common.mustCall(function(status) {
42+
assert.strictEqual(status, 0);
43+
}));
4844
}

‎test/parallel/test-crypto-binary-default.js‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -324,19 +324,23 @@ var rfc2202_sha1 = [
324324

325325
for (let i = 0, l = rfc2202_md5.length; i < l; i++) {
326326
if (!common.hasFipsCrypto) {
327-
assert.equal(rfc2202_md5[i]['hmac'],
328-
crypto.createHmac('md5', rfc2202_md5[i]['key'])
329-
.update(rfc2202_md5[i]['data'])
330-
.digest('hex'),
331-
'Test HMAC-MD5 : Test case ' + (i + 1) + ' rfc 2202');
327+
assert.strictEqual(
328+
rfc2202_md5[i]['hmac'],
329+
crypto.createHmac('md5', rfc2202_md5[i]['key'])
330+
.update(rfc2202_md5[i]['data'])
331+
.digest('hex'),
332+
'Test HMAC-MD5 : Test case ' + (i + 1) + ' rfc 2202'
333+
);
332334
}
333335
}
334336
for (let i = 0, l = rfc2202_sha1.length; i < l; i++) {
335-
assert.equal(rfc2202_sha1[i]['hmac'],
336-
crypto.createHmac('sha1', rfc2202_sha1[i]['key'])
337-
.update(rfc2202_sha1[i]['data'])
338-
.digest('hex'),
339-
'Test HMAC-SHA1 : Test case ' + (i + 1) + ' rfc 2202');
337+
assert.strictEqual(
338+
rfc2202_sha1[i]['hmac'],
339+
crypto.createHmac('sha1', rfc2202_sha1[i]['key'])
340+
.update(rfc2202_sha1[i]['data'])
341+
.digest('hex'),
342+
'Test HMAC-SHA1 : Test case ' + (i + 1) + ' rfc 2202'
343+
);
340344
}
341345

342346
// Test hashing

‎test/parallel/test-crypto-hmac.js‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -351,17 +351,21 @@ var rfc2202_sha1 = [
351351

352352
if (!common.hasFipsCrypto) {
353353
for (let i = 0, l = rfc2202_md5.length; i < l; i++) {
354-
assert.equal(rfc2202_md5[i]['hmac'],
355-
crypto.createHmac('md5', rfc2202_md5[i]['key'])
356-
.update(rfc2202_md5[i]['data'])
357-
.digest('hex'),
358-
'Test HMAC-MD5 : Test case ' + (i + 1) + ' rfc 2202');
354+
assert.strictEqual(
355+
rfc2202_md5[i]['hmac'],
356+
crypto.createHmac('md5', rfc2202_md5[i]['key'])
357+
.update(rfc2202_md5[i]['data'])
358+
.digest('hex'),
359+
'Test HMAC-MD5 : Test case ' + (i + 1) + ' rfc 2202'
360+
);
359361
}
360362
}
361363
for (let i = 0, l = rfc2202_sha1.length; i < l; i++) {
362-
assert.equal(rfc2202_sha1[i]['hmac'],
363-
crypto.createHmac('sha1', rfc2202_sha1[i]['key'])
364-
.update(rfc2202_sha1[i]['data'])
365-
.digest('hex'),
366-
'Test HMAC-SHA1 : Test case ' + (i + 1) + ' rfc 2202');
364+
assert.strictEqual(
365+
rfc2202_sha1[i]['hmac'],
366+
crypto.createHmac('sha1', rfc2202_sha1[i]['key'])
367+
.update(rfc2202_sha1[i]['data'])
368+
.digest('hex'),
369+
'Test HMAC-SHA1 : Test case ' + (i + 1) + ' rfc 2202'
370+
);
367371
}

‎test/parallel/test-net-server-max-connections-close-makes-more-available.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@ server.maxConnections = 1;
6969

7070
server.listen(0, function() {
7171
createConnection(0)
72-
.then(createConnection.bind(null, 1))
73-
.then(closeConnection.bind(null, 0))
74-
.then(createConnection.bind(null, 2))
75-
.then(createConnection.bind(null, 3))
76-
.then(server.close.bind(server))
77-
.then(closeConnection.bind(null, 2));
72+
.then(createConnection.bind(null, 1))
73+
.then(closeConnection.bind(null, 0))
74+
.then(createConnection.bind(null, 2))
75+
.then(createConnection.bind(null, 3))
76+
.then(server.close.bind(server))
77+
.then(closeConnection.bind(null, 2));
7878
});
7979

8080
process.on('exit', function() {

‎test/parallel/test-readline-interface.js‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -350,14 +350,22 @@ function isWarned(emitter) {
350350
assert.equal(readline.getStringWidth('A\ud83c\ude00BC'), 5); // surrogate
351351

352352
// check if vt control chars are stripped
353-
assert.equal(readline
354-
.stripVTControlCharacters('\u001b[31m> \u001b[39m'), '> ');
355-
assert.equal(readline
356-
.stripVTControlCharacters('\u001b[31m> \u001b[39m> '), '> > ');
357-
assert.equal(readline
358-
.stripVTControlCharacters('\u001b[31m\u001b[39m'), '');
359-
assert.equal(readline
360-
.stripVTControlCharacters('> '), '> ');
353+
assert.strictEqual(
354+
readline.stripVTControlCharacters('\u001b[31m> \u001b[39m'),
355+
'> '
356+
);
357+
assert.strictEqual(
358+
readline.stripVTControlCharacters('\u001b[31m> \u001b[39m> '),
359+
'> > '
360+
);
361+
assert.strictEqual(
362+
readline.stripVTControlCharacters('\u001b[31m\u001b[39m'),
363+
''
364+
);
365+
assert.strictEqual(
366+
readline.stripVTControlCharacters('> '),
367+
'> '
368+
);
361369
assert.equal(readline.getStringWidth('\u001b[31m> \u001b[39m'), 2);
362370
assert.equal(readline.getStringWidth('\u001b[31m> \u001b[39m> '), 4);
363371
assert.equal(readline.getStringWidth('\u001b[31m\u001b[39m'), 0);

0 commit comments

Comments
 (0)