Skip to content

Commit af092f1

Browse files
akito0107Fishrock123
authored andcommitted
test: cleanup test-net-server-address.js
Refactored test: - 'var' to 'const' - functon to arrow function - using common.mustCall() and common.fail() PR-URL: #8586 Reviewed-By: Yosuke Furukawa <yosuke.furukawa@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Ilkka Myller <ilkka.myller@nodefield.com> Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent a00ae75 commit af092f1

File tree

1 file changed

+39
-48
lines changed

1 file changed

+39
-48
lines changed
Lines changed: 39 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,89 +1,80 @@
11
'use strict';
2-
var common = require('../common');
3-
var assert = require('assert');
4-
var net = require('net');
2+
const common = require('../common');
3+
const assert = require('assert');
4+
const net = require('net');
55

66
// Test on IPv4 Server
7-
var family_ipv4 = 'IPv4';
8-
var server_ipv4 = net.createServer();
7+
const family_ipv4 = 'IPv4';
8+
const server_ipv4 = net.createServer();
99

10-
server_ipv4.on('error', function(e) {
11-
console.log('Error on ipv4 socket: ' + e.toString());
12-
});
10+
server_ipv4.on('error', common.fail);
1311

14-
server_ipv4.listen(common.PORT, common.localhostIPv4, function() {
15-
var address_ipv4 = server_ipv4.address();
16-
assert.strictEqual(address_ipv4.address, common.localhostIPv4);
17-
assert.strictEqual(address_ipv4.port, common.PORT);
18-
assert.strictEqual(address_ipv4.family, family_ipv4);
19-
server_ipv4.close();
20-
});
12+
server_ipv4
13+
.listen(common.PORT + 1, common.localhostIPv4, common.mustCall(() => {
14+
const address_ipv4 = server_ipv4.address();
15+
assert.strictEqual(address_ipv4.address, common.localhostIPv4);
16+
assert.strictEqual(address_ipv4.port, common.PORT + 1);
17+
assert.strictEqual(address_ipv4.family, family_ipv4);
18+
server_ipv4.close();
19+
}));
2120

2221
if (!common.hasIPv6) {
2322
common.skip('ipv6 part of test, no IPv6 support');
2423
return;
2524
}
2625

2726
// Test on IPv6 Server
28-
var localhost_ipv6 = '::1';
29-
var family_ipv6 = 'IPv6';
30-
var server_ipv6 = net.createServer();
27+
const localhost_ipv6 = '::1';
28+
const family_ipv6 = 'IPv6';
29+
const server_ipv6 = net.createServer();
3130

32-
server_ipv6.on('error', function(e) {
33-
console.log('Error on ipv6 socket: ' + e.toString());
34-
});
31+
server_ipv6.on('error', common.fail);
3532

36-
server_ipv6.listen(common.PORT, localhost_ipv6, function() {
37-
var address_ipv6 = server_ipv6.address();
33+
server_ipv6.listen(common.PORT + 2, localhost_ipv6, common.mustCall(() => {
34+
const address_ipv6 = server_ipv6.address();
3835
assert.strictEqual(address_ipv6.address, localhost_ipv6);
39-
assert.strictEqual(address_ipv6.port, common.PORT);
36+
assert.strictEqual(address_ipv6.port, common.PORT + 2);
4037
assert.strictEqual(address_ipv6.family, family_ipv6);
4138
server_ipv6.close();
42-
});
39+
}));
4340

4441
// Test without hostname or ip
45-
var anycast_ipv6 = '::';
46-
var server1 = net.createServer();
42+
const anycast_ipv6 = '::';
43+
const server1 = net.createServer();
4744

48-
server1.on('error', function(e) {
49-
console.log('Error on ip socket: ' + e.toString());
50-
});
45+
server1.on('error', common.fail);
5146

5247
// Specify the port number
53-
server1.listen(common.PORT, function() {
54-
var address = server1.address();
48+
server1.listen(common.PORT + 3, common.mustCall(() => {
49+
const address = server1.address();
5550
assert.strictEqual(address.address, anycast_ipv6);
56-
assert.strictEqual(address.port, common.PORT);
51+
assert.strictEqual(address.port, common.PORT + 3);
5752
assert.strictEqual(address.family, family_ipv6);
5853
server1.close();
59-
});
54+
}));
6055

6156
// Test without hostname or port
62-
var server2 = net.createServer();
57+
const server2 = net.createServer();
6358

64-
server2.on('error', function(e) {
65-
console.log('Error on ip socket: ' + e.toString());
66-
});
59+
server2.on('error', common.fail);
6760

6861
// Don't specify the port number
69-
server2.listen(function() {
70-
var address = server2.address();
62+
server2.listen(common.mustCall(() => {
63+
const address = server2.address();
7164
assert.strictEqual(address.address, anycast_ipv6);
7265
assert.strictEqual(address.family, family_ipv6);
7366
server2.close();
74-
});
67+
}));
7568

7669
// Test without hostname, but with a false-y port
77-
var server3 = net.createServer();
70+
const server3 = net.createServer();
7871

79-
server3.on('error', function(e) {
80-
console.log('Error on ip socket: ' + e.toString());
81-
});
72+
server3.on('error', common.fail);
8273

8374
// Specify a false-y port number
84-
server3.listen(0, function() {
85-
var address = server3.address();
75+
server3.listen(0, common.mustCall(() => {
76+
const address = server3.address();
8677
assert.strictEqual(address.address, anycast_ipv6);
8778
assert.strictEqual(address.family, family_ipv6);
8879
server3.close();
89-
});
80+
}));

0 commit comments

Comments
 (0)