Commit b611aad
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 <targos@protonmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>1 parent 969cef1 commit b611aad
1 file changed
Lines changed: 20 additions & 36 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,45 +1,29 @@ | |||
| 1 | 1 | 'use strict'; | |
| 2 | - require('../common'); | ||
| 3 | - var assert = require('assert'); | ||
| 2 | + const common = require('../common'); | ||
| 3 | + const assert = require('assert'); | ||
| 4 | 4 | ||
| 5 | - let immediateThis, intervalThis, timeoutThis; | ||
| 6 | - let immediateArgsThis, intervalArgsThis, timeoutArgsThis; | ||
| 5 | + const immediateHandler = setImmediate(common.mustCall(function() { | ||
| 6 | + assert.strictEqual(this, immediateHandler); | ||
| 7 | + })); | ||
| 7 | 8 | ||
| 8 | - var immediateHandler = setImmediate(function() { | ||
| 9 | - immediateThis = this; | ||
| 10 | - }); | ||
| 9 | + const immediateArgsHandler = setImmediate(common.mustCall(function() { | ||
| 10 | + assert.strictEqual(this, immediateArgsHandler); | ||
| 11 | + }), 'args ...'); | ||
| 11 | 12 | ||
| 12 | - var immediateArgsHandler = setImmediate(function() { | ||
| 13 | - immediateArgsThis = this; | ||
| 14 | - }, 'args ...'); | ||
| 15 | - | ||
| 16 | - var intervalHandler = setInterval(function() { | ||
| 13 | + const intervalHandler = setInterval(common.mustCall(function() { | ||
| 17 | 14 | clearInterval(intervalHandler); | |
| 15 | + assert.strictEqual(this, intervalHandler); | ||
| 16 | + }), 1); | ||
| 18 | 17 | ||
| 19 | - intervalThis = this; | ||
| 20 | - }); | ||
| 21 | - | ||
| 22 | - var intervalArgsHandler = setInterval(function() { | ||
| 18 | + const intervalArgsHandler = setInterval(common.mustCall(function() { | ||
| 23 | 19 | clearInterval(intervalArgsHandler); | |
| 20 | + assert.strictEqual(this, intervalArgsHandler); | ||
| 21 | + }), 1, 'args ...'); | ||
| 24 | 22 | ||
| 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); | ||
| 42 | 26 | ||
| 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