FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

test: refactor the code in test-dns-ipv4 · nodejs/node@e794c0c · GitHub

/ node Public

Commit e794c0c

Browse files
edsadr
authored and
MylesBorins
committed
test: refactor the code in test-dns-ipv4
* remove the manual control for functions execution * use common.mustCall to control the functions execution automatically * use let and const instead of var * use assert.strictEqual instead assert.equal PR-URL: #10200 Reviewed-By: Italo A. Casas <me@italoacasas.com> Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
1 parent 5c835c5 commit e794c0c

1 file changed

Lines changed: 70 additions & 73 deletions

File tree

‎test/internet/test-dns-ipv4.js‎

Lines changed: 70 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
'use strict';
2-
require('../common');
2+
const common = require('../common');
33
const assert = require('assert');
44
const dns = require('dns');
55
const net = require('net');
66
const isIPv4 = net.isIPv4;
77

8-
let expected = 0;
9-
let completed = 0;
108
let running = false;
119
const queue = [];
1210

1311
function TEST(f) {
1412
function next() {
15-
var f = queue.shift();
13+
const f = queue.shift();
1614
if (f) {
1715
running = true;
1816
console.log(f.name);
@@ -22,11 +20,9 @@ function TEST(f) {
2220

2321
function done() {
2422
running = false;
25-
completed++;
2623
process.nextTick(next);
2724
}
2825

29-
expected++;
3026
queue.push(f);
3127

3228
if (!running) {
@@ -39,149 +35,150 @@ function checkWrap(req) {
3935
}
4036

4137
TEST(function test_resolve4(done) {
42-
var req = dns.resolve4('www.google.com', function(err, ips) {
43-
if (err) throw err;
38+
const req = dns.resolve4('www.google.com',
39+
common.mustCall((err, ips) => {
40+
assert.ifError(err);
4441

45-
assert.ok(ips.length > 0);
42+
assert.ok(ips.length > 0);
4643

47-
for (var i = 0; i < ips.length; i++) {
48-
assert.ok(isIPv4(ips[i]));
49-
}
44+
for (let i = 0; i < ips.length; i++) {
45+
assert.ok(isIPv4(ips[i]));
46+
}
5047

51-
done();
52-
});
48+
done();
49+
}));
5350

5451
checkWrap(req);
5552
});
5653

5754
TEST(function test_reverse_ipv4(done) {
58-
var req = dns.reverse('8.8.8.8', function(err, domains) {
59-
if (err) throw err;
55+
const req = dns.reverse('8.8.8.8',
56+
common.mustCall((err, domains) => {
57+
assert.ifError(err);
6058

61-
assert.ok(domains.length > 0);
59+
assert.ok(domains.length > 0);
6260

63-
for (var i = 0; i < domains.length; i++) {
64-
assert.ok(domains[i]);
65-
assert.ok(typeof domains[i] === 'string');
66-
}
61+
for (let i = 0; i < domains.length; i++) {
62+
assert.ok(domains[i]);
63+
assert.ok(typeof domains[i] === 'string');
64+
}
6765

68-
done();
69-
});
66+
done();
67+
}));
7068

7169
checkWrap(req);
7270
});
7371

7472
TEST(function test_lookup_ipv4_explicit(done) {
75-
var req = dns.lookup('www.google.com', 4, function(err, ip, family) {
76-
if (err) throw err;
77-
assert.ok(net.isIPv4(ip));
78-
assert.strictEqual(family, 4);
73+
const req = dns.lookup('www.google.com', 4,
74+
common.mustCall((err, ip, family) => {
75+
assert.ifError(err);
76+
assert.ok(net.isIPv4(ip));
77+
assert.strictEqual(family, 4);
7978

80-
done();
81-
});
79+
done();
80+
}));
8281

8382
checkWrap(req);
8483
});
8584

8685
TEST(function test_lookup_ipv4_implicit(done) {
87-
var req = dns.lookup('www.google.com', function(err, ip, family) {
88-
if (err) throw err;
89-
assert.ok(net.isIPv4(ip));
90-
assert.strictEqual(family, 4);
86+
const req = dns.lookup('www.google.com',
87+
common.mustCall((err, ip, family) => {
88+
assert.ifError(err);
89+
assert.ok(net.isIPv4(ip));
90+
assert.strictEqual(family, 4);
9191

92-
done();
93-
});
92+
done();
93+
}));
9494

9595
checkWrap(req);
9696
});
9797

9898
TEST(function test_lookup_ipv4_explicit_object(done) {
99-
var req = dns.lookup('www.google.com', {
99+
const req = dns.lookup('www.google.com', {
100100
family: 4
101-
}, function(err, ip, family) {
102-
if (err) throw err;
101+
}, common.mustCall((err, ip, family) => {
102+
assert.ifError(err);
103103
assert.ok(net.isIPv4(ip));
104104
assert.strictEqual(family, 4);
105105

106106
done();
107-
});
107+
}));
108108

109109
checkWrap(req);
110110
});
111111

112112
TEST(function test_lookup_ipv4_hint_addrconfig(done) {
113-
var req = dns.lookup('www.google.com', {
113+
const req = dns.lookup('www.google.com', {
114114
hints: dns.ADDRCONFIG
115-
}, function(err, ip, family) {
116-
if (err) throw err;
115+
}, common.mustCall((err, ip, family) => {
116+
assert.ifError(err);
117117
assert.ok(net.isIPv4(ip));
118118
assert.strictEqual(family, 4);
119119

120120
done();
121-
});
121+
}));
122122

123123
checkWrap(req);
124124
});
125125

126126
TEST(function test_lookup_ip_ipv4(done) {
127-
var req = dns.lookup('127.0.0.1', function(err, ip, family) {
128-
if (err) throw err;
129-
assert.strictEqual(ip, '127.0.0.1');
130-
assert.strictEqual(family, 4);
127+
const req = dns.lookup('127.0.0.1',
128+
common.mustCall((err, ip, family) => {
129+
assert.ifError(err);
130+
assert.strictEqual(ip, '127.0.0.1');
131+
assert.strictEqual(family, 4);
131132

132-
done();
133-
});
133+
done();
134+
}));
134135

135136
checkWrap(req);
136137
});
137138

138139
TEST(function test_lookup_localhost_ipv4(done) {
139-
var req = dns.lookup('localhost', 4, function(err, ip, family) {
140-
if (err) throw err;
141-
assert.strictEqual(ip, '127.0.0.1');
142-
assert.strictEqual(family, 4);
140+
const req = dns.lookup('localhost', 4,
141+
common.mustCall((err, ip, family) => {
142+
assert.ifError(err);
143+
assert.strictEqual(ip, '127.0.0.1');
144+
assert.strictEqual(family, 4);
143145

144-
done();
145-
});
146+
done();
147+
}));
146148

147149
checkWrap(req);
148150
});
149151

150152
TEST(function test_lookup_all_ipv4(done) {
151-
var req = dns.lookup(
153+
const req = dns.lookup(
152154
'www.google.com',
153155
{all: true, family: 4},
154-
function(err, ips) {
155-
if (err) throw err;
156+
common.mustCall((err, ips) => {
157+
assert.ifError(err);
156158
assert.ok(Array.isArray(ips));
157159
assert.ok(ips.length > 0);
158160

159-
ips.forEach(function(ip) {
161+
ips.forEach((ip) => {
160162
assert.ok(isIPv4(ip.address));
161163
assert.strictEqual(ip.family, 4);
162164
});
163165

164166
done();
165167
}
166-
);
168+
));
167169

168170
checkWrap(req);
169171
});
170172

171173
TEST(function test_lookupservice_ip_ipv4(done) {
172-
var req = dns.lookupService('127.0.0.1', 80, function(err, host, service) {
173-
if (err) throw err;
174-
assert.equal(typeof host, 'string');
175-
assert(host);
176-
assert(['http', 'www', '80'].includes(service));
177-
done();
178-
});
174+
const req = dns.lookupService('127.0.0.1', 80,
175+
common.mustCall((err, host, service) => {
176+
assert.ifError(err);
177+
assert.strictEqual(typeof host, 'string');
178+
assert(host);
179+
assert(['http', 'www', '80'].includes(service));
180+
done();
181+
}));
179182

180183
checkWrap(req);
181184
});
182-
183-
process.on('exit', function() {
184-
console.log(completed + ' tests completed');
185-
assert.equal(running, false);
186-
assert.strictEqual(expected, completed);
187-
});

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL