Skip to content

Commit 3269a7d

Browse files
Thomas van LankveldFishrock123
authored andcommitted
test: cleanup test-tls-connect-given-socket.js
Changed vars to consts and lets, assert.equals to assert.strictEquals and added common.mustCall around callbacks. Switched to arrow functions. PR-URL: #8616 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Ilkka Myller <ilkka.myller@nodefield.com>
1 parent 5e5a1c0 commit 3269a7d

File tree

1 file changed

+32
-32
lines changed

1 file changed

+32
-32
lines changed
Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,78 +1,78 @@
11
'use strict';
2-
var common = require('../common');
3-
var assert = require('assert');
2+
const common = require('../common');
3+
const assert = require('assert');
44

55
if (!common.hasCrypto) {
66
common.skip('missing crypto');
77
return;
88
}
9-
var tls = require('tls');
9+
const tls = require('tls');
1010

11-
var net = require('net');
12-
var fs = require('fs');
13-
var path = require('path');
11+
const net = require('net');
12+
const fs = require('fs');
13+
const path = require('path');
1414

15-
var serverConnected = 0;
16-
var clientConnected = 0;
15+
let serverConnected = 0;
16+
let clientConnected = 0;
1717

18-
var options = {
18+
const options = {
1919
key: fs.readFileSync(path.join(common.fixturesDir, 'test_key.pem')),
2020
cert: fs.readFileSync(path.join(common.fixturesDir, 'test_cert.pem'))
2121
};
2222

23-
var server = tls.createServer(options, function(socket) {
23+
const server = tls.createServer(options, (socket) => {
2424
serverConnected++;
2525
socket.end('Hello');
26-
}).listen(0, function() {
27-
var waiting = 2;
26+
}).listen(0, () => {
27+
let waiting = 2;
2828
function establish(socket) {
29-
var client = tls.connect({
29+
const client = tls.connect({
3030
rejectUnauthorized: false,
3131
socket: socket
32-
}, function() {
32+
}, () => {
3333
clientConnected++;
34-
var data = '';
35-
client.on('data', function(chunk) {
34+
let data = '';
35+
client.on('data', common.mustCall((chunk) => {
3636
data += chunk.toString();
37-
});
38-
client.on('end', function() {
39-
assert.equal(data, 'Hello');
37+
}));
38+
client.on('end', common.mustCall(() => {
39+
assert.strictEqual(data, 'Hello');
4040
if (--waiting === 0)
4141
server.close();
42-
});
42+
}));
4343
});
4444
assert(client.readable);
4545
assert(client.writable);
4646

4747
return client;
4848
}
4949

50+
const { port } = server.address();
51+
5052
// Immediate death socket
51-
var immediateDeath = net.connect(this.address().port);
53+
const immediateDeath = net.connect(port);
5254
establish(immediateDeath).destroy();
5355

5456
// Outliving
55-
var outlivingTCP = net.connect(this.address().port);
56-
outlivingTCP.on('connect', function() {
57+
const outlivingTCP = net.connect(port, common.mustCall(() => {
5758
outlivingTLS.destroy();
5859
next();
59-
});
60-
var outlivingTLS = establish(outlivingTCP);
60+
}));
61+
const outlivingTLS = establish(outlivingTCP);
6162

6263
function next() {
6364
// Already connected socket
64-
var connected = net.connect(server.address().port, function() {
65+
const connected = net.connect(port, common.mustCall(() => {
6566
establish(connected);
66-
});
67+
}));
6768

6869
// Connecting socket
69-
var connecting = net.connect(server.address().port);
70+
const connecting = net.connect(port);
7071
establish(connecting);
71-
7272
}
7373
});
7474

75-
process.on('exit', function() {
76-
assert.equal(serverConnected, 2);
77-
assert.equal(clientConnected, 2);
75+
process.on('exit', () => {
76+
assert.strictEqual(serverConnected, 2);
77+
assert.strictEqual(clientConnected, 2);
7878
});

0 commit comments

Comments
 (0)