Skip to content

Commit 76b0e5b

Browse files
Trottevanlucas
authored andcommitted
test: refactor test-timers-this
* use common.mustCall() and eliminate exit handler * provide timer durtion of 1ms where previously omitted * var -> const PR-URL: #10315 Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Jeremiah Senkpiel <[email protected]>
1 parent 4bed947 commit 76b0e5b

File tree

1 file changed

+20
-36
lines changed

1 file changed

+20
-36
lines changed

test/parallel/test-timers-this.js

+20-36
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,29 @@
11
'use strict';
2-
require('../common');
3-
var assert = require('assert');
2+
const common = require('../common');
3+
const assert = require('assert');
44

5-
let immediateThis, intervalThis, timeoutThis;
6-
let immediateArgsThis, intervalArgsThis, timeoutArgsThis;
5+
const immediateHandler = setImmediate(common.mustCall(function() {
6+
assert.strictEqual(this, immediateHandler);
7+
}));
78

8-
var immediateHandler = setImmediate(function() {
9-
immediateThis = this;
10-
});
9+
const immediateArgsHandler = setImmediate(common.mustCall(function() {
10+
assert.strictEqual(this, immediateArgsHandler);
11+
}), 'args ...');
1112

12-
var immediateArgsHandler = setImmediate(function() {
13-
immediateArgsThis = this;
14-
}, 'args ...');
15-
16-
var intervalHandler = setInterval(function() {
13+
const intervalHandler = setInterval(common.mustCall(function() {
1714
clearInterval(intervalHandler);
15+
assert.strictEqual(this, intervalHandler);
16+
}), 1);
1817

19-
intervalThis = this;
20-
});
21-
22-
var intervalArgsHandler = setInterval(function() {
18+
const intervalArgsHandler = setInterval(common.mustCall(function() {
2319
clearInterval(intervalArgsHandler);
20+
assert.strictEqual(this, intervalArgsHandler);
21+
}), 1, 'args ...');
2422

25-
intervalArgsThis = this;
26-
}, 0, 'args ...');
27-
28-
var timeoutHandler = setTimeout(function() {
29-
timeoutThis = this;
30-
});
31-
32-
var timeoutArgsHandler = setTimeout(function() {
33-
timeoutArgsThis = this;
34-
}, 0, 'args ...');
35-
36-
process.once('exit', function() {
37-
assert.strictEqual(immediateThis, immediateHandler);
38-
assert.strictEqual(immediateArgsThis, immediateArgsHandler);
39-
40-
assert.strictEqual(intervalThis, intervalHandler);
41-
assert.strictEqual(intervalArgsThis, intervalArgsHandler);
23+
const timeoutHandler = setTimeout(common.mustCall(function() {
24+
assert.strictEqual(this, timeoutHandler);
25+
}), 1);
4226

43-
assert.strictEqual(timeoutThis, timeoutHandler);
44-
assert.strictEqual(timeoutArgsThis, timeoutArgsHandler);
45-
});
27+
const timeoutArgsHandler = setTimeout(common.mustCall(function() {
28+
assert.strictEqual(this, timeoutArgsHandler);
29+
}), 1, 'args ...');

0 commit comments

Comments
 (0)